From 9a5f812c8ff9655904b4fb860d3df645bc9e1097 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 27 Jul 2003 18:39:34 +0000 Subject: [PATCH] Simplify: use an enum instead of magic constants. --- stepmania/src/MusicWheel.cpp | 8 ++++---- stepmania/src/PrefsManager.cpp | 2 +- stepmania/src/PrefsManager.h | 3 +-- stepmania/src/ScreenAppearanceOptions.cpp | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp index 323d618c5a..b9305785b6 100644 --- a/stepmania/src/MusicWheel.cpp +++ b/stepmania/src/MusicWheel.cpp @@ -574,18 +574,18 @@ void MusicWheel::BuildWheelItemDatas( vector &arrayWheelItemDatas // default sort order; other songs may alter this SortCoursePointerArrayByDifficulty( apCourses ); - if (PREFSMAN->m_iCourseSortOrder != 0) + if (PREFSMAN->m_iCourseSortOrder != PrefsManager::COURSE_SORT_SONGS) { for(i=0; iUpdateCourseStats(); - if (PREFSMAN->m_iCourseSortOrder == 1) + if (PREFSMAN->m_iCourseSortOrder == PrefsManager::COURSE_SORT_METER) SortCoursePointerArrayByAvgDifficulty( apCourses ); - if (PREFSMAN->m_iCourseSortOrder == 2) + if (PREFSMAN->m_iCourseSortOrder == PrefsManager::COURSE_SORT_METER_SUM) SortCoursePointerArrayByTotalDifficulty( apCourses ); - if (PREFSMAN->m_iCourseSortOrder == 3) + if (PREFSMAN->m_iCourseSortOrder == PrefsManager::COURSE_SORT_RANK) SortCoursePointerArrayByRanking( apCourses ); } diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index c80952c431..e1475a5036 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -110,7 +110,7 @@ PrefsManager::PrefsManager() m_bPickExtraStage = false; // default to old sort order - m_iCourseSortOrder = 0; + m_iCourseSortOrder = COURSE_SORT_SONGS; m_fLongVerSongSeconds = 60*2.5f; // Dynamite Rave is 2:55 m_fMarathonVerSongSeconds = 60*5.f; diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index 2507d6f9d4..a64b18ccb6 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -85,8 +85,7 @@ public: bool m_bTenFooterInRed; // course ranking - // by # songs = 0, avg diff=1, total diff=2, ranking=3 - int m_iCourseSortOrder; + enum { COURSE_SORT_SONGS, COURSE_SORT_METER, COURSE_SORT_METER_SUM, COURSE_SORT_RANK } m_iCourseSortOrder; /* 0 = no; 1 = yes; -1 = auto (do whatever is appropriate for the arch). */ int m_iBoostAppPriority; diff --git a/stepmania/src/ScreenAppearanceOptions.cpp b/stepmania/src/ScreenAppearanceOptions.cpp index 44ff66ffcc..67a793edd5 100644 --- a/stepmania/src/ScreenAppearanceOptions.cpp +++ b/stepmania/src/ScreenAppearanceOptions.cpp @@ -195,7 +195,7 @@ void ScreenAppearanceOptions::ExportOptions() PREFSMAN->m_bShowLyrics = !!m_iSelectedOption[0][AO_SHOW_LYRICS]; PREFSMAN->m_bDancePointsForOni = !!m_iSelectedOption[0][AO_DANCE_POINTS_FOR_ONI]; PREFSMAN->m_bTenFooterInRed = !!m_iSelectedOption[0][AO_TEN_FOOT_RED]; - PREFSMAN->m_iCourseSortOrder = m_iSelectedOption[0][AO_COURSE_SORT]; + (int&)PREFSMAN->m_iCourseSortOrder = m_iSelectedOption[0][AO_COURSE_SORT]; PREFSMAN->SaveGamePrefsToDisk(); PREFSMAN->SaveGlobalPrefsToDisk();