From 17980755509c373d690ee34c3d4df72d3e7f28d5 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Thu, 14 Jul 2005 05:45:51 +0000
Subject: [PATCH] make EDIT_MODE not common

---
 stepmania/src/CommonMetrics.cpp | 1 -
 stepmania/src/CommonMetrics.h   | 1 -
 stepmania/src/ScreenEdit.cpp    | 2 ++
 stepmania/src/ScreenEdit.h      | 1 +
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/stepmania/src/CommonMetrics.cpp b/stepmania/src/CommonMetrics.cpp
index 4e181c0427..445fbec6c0 100644
--- a/stepmania/src/CommonMetrics.cpp
+++ b/stepmania/src/CommonMetrics.cpp
@@ -15,7 +15,6 @@ ThemeMetric<CString>	DEFAULT_MODIFIERS					("Common","DefaultModifiers" );
 ThemeMetric<CString>	DEFAULT_CPU_MODIFIERS				("Common","DefaultCpuModifiers" );
 ThemeMetric1D<RageColor> PLAYER_COLOR						("Common",PLAYER_COLOR_NAME,NUM_PLAYERS);
 ThemeMetric<CString>	WINDOW_TITLE						("Common","WindowTitle");
-ThemeMetricEnum<EditMode>	EDIT_MODE						("Common","EditMode");
 ThemeMetric<int>		MAX_COURSE_ENTRIES_BEFORE_VARIOUS	("Common","MaxCourseEntriesBeforeShowVarious");
 ThemeMetric<float>		TICK_EARLY_SECONDS					("ScreenGameplay","TickEarlySeconds");
 ThemeMetricDifficultiesToShow		DIFFICULTIES_TO_SHOW		("Common","DifficultiesToShow");
diff --git a/stepmania/src/CommonMetrics.h b/stepmania/src/CommonMetrics.h
index 7c5c257b9b..97a889069e 100644
--- a/stepmania/src/CommonMetrics.h
+++ b/stepmania/src/CommonMetrics.h
@@ -50,7 +50,6 @@ extern ThemeMetric<CString>		DEFAULT_MODIFIERS;
 extern ThemeMetric<CString>		DEFAULT_CPU_MODIFIERS;
 extern ThemeMetric1D<RageColor> PLAYER_COLOR;
 extern ThemeMetric<CString>		WINDOW_TITLE;
-extern ThemeMetricEnum<EditMode>	EDIT_MODE;
 extern ThemeMetric<int>			MAX_COURSE_ENTRIES_BEFORE_VARIOUS;
 extern ThemeMetric<float>		TICK_EARLY_SECONDS;
 extern ThemeMetricDifficultiesToShow		DIFFICULTIES_TO_SHOW;
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 1806f3ac52..91be2541da 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -556,6 +556,8 @@ ScreenEdit::ScreenEdit( CString sName ) : ScreenWithMenuElements( sName )
 
 void ScreenEdit::Init()
 {
+	EDIT_MODE.Load(m_sName,"EditMode");
+
 	ScreenWithMenuElements::Init();
 
 	InitEditMappings();
diff --git a/stepmania/src/ScreenEdit.h b/stepmania/src/ScreenEdit.h
index c87e894680..b94fd95bff 100644
--- a/stepmania/src/ScreenEdit.h
+++ b/stepmania/src/ScreenEdit.h
@@ -231,6 +231,7 @@ protected:
 
 	RageSound		m_soundAssistTick;
 
+	ThemeMetricEnum<EditMode> EDIT_MODE;
 
 public:
 	enum MainMenuChoice {