From 2fbe882366b9101bf702674ae72a1eb89bc4498a Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Tue, 26 Sep 2006 03:19:37 +0000
Subject: [PATCH] ThemeMetric<EditMode>

---
 stepmania/Themes/default/metrics.ini       | 10 +++++-----
 stepmania/src/EditMenu.h                   |  2 +-
 stepmania/src/ScreenEdit.cpp               |  2 +-
 stepmania/src/ScreenEdit.h                 |  2 +-
 stepmania/src/ScreenOptionsManageCourses.h |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 137c2caaee..359a288f70 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -1983,7 +1983,7 @@ NextScreen="ScreenRanking"
 StartScreen="ScreenTitleMenu"
 
 [EditMenu]
-EditMode=EditMode_Full
+EditMode="EditMode_Full"
 ShowGroups=true
 Arrows1X=SCREEN_CENTER_X-130
 Arrows2X=SCREEN_CENTER_X+270
@@ -4124,7 +4124,7 @@ PrepareScreens=GetEditModeSubScreens()
 GroupedScreens=GetEditModeSubScreens()
 PersistScreens=GetEditModeSubScreens()
 
-EditMode=EditMode_Full
+EditMode="EditMode_Full"
 Fallback="ScreenWithMenuElementsBlank"
 Class="ScreenEdit"
 NextScreen="ScreenEditMenu"
@@ -4397,7 +4397,7 @@ AllowRepeatingChangeValueInput=true
 Class="ScreenOptionsManageEditSteps"
 Fallback="ScreenOptionsManage"
 CreateNewScreen="ScreenEditMenu"
-EditMode=EditMode_Full
+EditMode="EditMode_Full"
 PrevScreen="ScreenSelectEditMode"
 NextScreen="ScreenOptionsEditCourse"
 PrepareScreens="ScreenMiniMenuContext"
@@ -4406,7 +4406,7 @@ PersistScreens="ScreenMiniMenuContext"
 
 [ScreenOptionsEditCoursesSimple]
 Fallback="ScreenOptions"
-EditMode=EditMode_Full
+EditMode="EditMode_Full"
 PrepareScreens="ScreenMiniMenuContext"
 GroupedScreens="ScreenMiniMenuContext"
 PersistScreens="ScreenMiniMenuContext"
@@ -4450,7 +4450,7 @@ NextScreen="ScreenEditCourseMods"
 [ScreenEditCourseMods]
 Class="ScreenEdit"
 Fallback="ScreenEdit"
-EditMode=EditMode_CourseMods
+EditMode="EditMode_CourseMods"
 NextScreen="ScreenOptionsEditCourseEntry"
 PrevScreen="ScreenOptionsEditCourseEntry"
 
diff --git a/stepmania/src/EditMenu.h b/stepmania/src/EditMenu.h
index 782366acf0..09b428a842 100644
--- a/stepmania/src/EditMenu.h
+++ b/stepmania/src/EditMenu.h
@@ -133,7 +133,7 @@ private:
 	ThemeMetric<apActorCommands> ROW_VALUE_ON_COMMAND;
 	ThemeMetric1D<float> ROW_Y;
 public:
-	ThemeMetric<int> EDIT_MODE;
+	ThemeMetric<EditMode> EDIT_MODE;
 };
 
 #endif
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 5b7c0acddb..0547b74340 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -669,7 +669,7 @@ void ScreenEdit::Init()
 	m_fBeatToReturnTo = 0;
 
 	GAMESTATE->m_bGameplayLeadIn.Set( true );
-	GAMESTATE->m_EditMode = (EditMode)EDIT_MODE.GetValue();
+	GAMESTATE->m_EditMode = EDIT_MODE.GetValue();
 	GAMESTATE->m_fSongBeat = 0;
 	m_fTrailingBeat = GAMESTATE->m_fSongBeat;
 
diff --git a/stepmania/src/ScreenEdit.h b/stepmania/src/ScreenEdit.h
index 57e309541a..2682ca0b63 100644
--- a/stepmania/src/ScreenEdit.h
+++ b/stepmania/src/ScreenEdit.h
@@ -272,7 +272,7 @@ protected:
 	RageSound		m_soundMusic;
 	RageSound		m_soundAssistTick;
 
-	ThemeMetric<int> EDIT_MODE;
+	ThemeMetric<EditMode> EDIT_MODE;
 
 public:
 	enum MainMenuChoice
diff --git a/stepmania/src/ScreenOptionsManageCourses.h b/stepmania/src/ScreenOptionsManageCourses.h
index 38af55c198..1c1dcab71f 100644
--- a/stepmania/src/ScreenOptionsManageCourses.h
+++ b/stepmania/src/ScreenOptionsManageCourses.h
@@ -37,7 +37,7 @@ private:
 	Course *GetCourseWithFocus() const;
 
 	vector<Course*> m_vpCourses;
-	ThemeMetric<int> EDIT_MODE;
+	ThemeMetric<EditMode> EDIT_MODE;
 	ThemeMetric<RString> CREATE_NEW_SCREEN;
 };