From 0f199dc7bce45dab1bb72f34021e76bf75a13e15 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Mon, 7 Aug 2006 01:23:59 +0000 Subject: [PATCH] Cleanup. --- stepmania/src/SongManager.cpp | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp index f675fcc66c..f03a4a849d 100644 --- a/stepmania/src/SongManager.cpp +++ b/stepmania/src/SongManager.cpp @@ -44,23 +44,24 @@ const RString ADDITIONAL_SONGS_DIR = "/AdditionalSongs/"; const RString COURSES_DIR = "/Courses/"; const RString EDIT_SUBDIR = "Edits/"; -static const ThemeMetric EXTRA_COLOR ("SongManager","ExtraColor"); -static const ThemeMetric EXTRA_COLOR_METER ("SongManager","ExtraColorMeter"); -static const ThemeMetric USE_PREFERRED_SORT_COLOR ("SongManager","UsePreferredSortColor"); -static const ThemeMetric USE_UNLOCK_COLOR ("SongManager","UseUnlockColor"); -static const ThemeMetric UNLOCK_COLOR ("SongManager","UnlockColor"); -static const ThemeMetric MOVE_UNLOCKS_TO_BOTTOM_OF_PREFERRED_SORT ("SongManager","MoveUnlocksToBottomOfPreferredSort"); +static const ThemeMetric EXTRA_COLOR ( "SongManager", "ExtraColor" ); +static const ThemeMetric EXTRA_COLOR_METER ( "SongManager", "ExtraColorMeter" ); +static const ThemeMetric USE_PREFERRED_SORT_COLOR ( "SongManager", "UsePreferredSortColor" ); +static const ThemeMetric USE_UNLOCK_COLOR ( "SongManager", "UseUnlockColor" ); +static const ThemeMetric UNLOCK_COLOR ( "SongManager", "UnlockColor" ); +static const ThemeMetric MOVE_UNLOCKS_TO_BOTTOM_OF_PREFERRED_SORT ( "SongManager", "MoveUnlocksToBottomOfPreferredSort" ); -RString SONG_GROUP_COLOR_NAME( size_t i ) { return ssprintf("SongGroupColor%i",(int) i+1); } -RString COURSE_GROUP_COLOR_NAME( size_t i ) { return ssprintf("CourseGroupColor%i",(int) i+1); } + +RString SONG_GROUP_COLOR_NAME( size_t i ) { return ssprintf( "SongGroupColor%i", (int) i+1 ); } +RString COURSE_GROUP_COLOR_NAME( size_t i ) { return ssprintf( "CourseGroupColor%i", (int) i+1 ); } SongManager::SongManager() { - NUM_SONG_GROUP_COLORS .Load("SongManager","NumSongGroupColors"); - SONG_GROUP_COLOR .Load("SongManager",SONG_GROUP_COLOR_NAME,NUM_SONG_GROUP_COLORS); - NUM_COURSE_GROUP_COLORS .Load("SongManager","NumCourseGroupColors"); - COURSE_GROUP_COLOR .Load("SongManager",COURSE_GROUP_COLOR_NAME,NUM_COURSE_GROUP_COLORS); + NUM_SONG_GROUP_COLORS .Load( "SongManager", "NumSongGroupColors" ); + SONG_GROUP_COLOR .Load( "SongManager", SONG_GROUP_COLOR_NAME, NUM_SONG_GROUP_COLORS ); + NUM_COURSE_GROUP_COLORS .Load( "SongManager", "NumCourseGroupColors" ); + COURSE_GROUP_COLOR .Load( "SongManager", COURSE_GROUP_COLOR_NAME, NUM_COURSE_GROUP_COLORS ); } SongManager::~SongManager()