From fc255b06eb37f8d7f79d76fded3414a72005ea99 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 7 Oct 2006 23:14:58 +0000 Subject: [PATCH] simplify, remove unused --- stepmania/src/Difficulty.cpp | 6 +++--- stepmania/src/Difficulty.h | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/stepmania/src/Difficulty.cpp b/stepmania/src/Difficulty.cpp index ba6275e498..6081acfa6b 100644 --- a/stepmania/src/Difficulty.cpp +++ b/stepmania/src/Difficulty.cpp @@ -50,12 +50,12 @@ Difficulty StringToDifficulty( const RString& sDC ) const RString &CourseDifficultyToLocalizedString( CourseDifficulty x ) { - static auto_ptr g_CourseDifficultyName[NUM_CourseDifficulty]; + static auto_ptr g_CourseDifficultyName[NUM_Difficulty]; if( g_CourseDifficultyName[0].get() == NULL ) { - for( unsigned i = 0; i < NUM_CourseDifficulty; ++i ) + FOREACH_Difficulty(i) { - auto_ptr ap( new LocalizedString("CourseDifficulty", DifficultyToString((CourseDifficulty)i)) ); + auto_ptr ap( new LocalizedString("CourseDifficulty", DifficultyToString(i)) ); g_CourseDifficultyName[i] = ap; } } diff --git a/stepmania/src/Difficulty.h b/stepmania/src/Difficulty.h index 6befb2142f..b46528b96c 100644 --- a/stepmania/src/Difficulty.h +++ b/stepmania/src/Difficulty.h @@ -25,8 +25,6 @@ LuaDeclareType( Difficulty ); typedef Difficulty CourseDifficulty; -#define NUM_CourseDifficulty NUM_Difficulty -#define CourseDifficulty_Invalid Difficulty_Invalid #define FOREACH_CourseDifficulty FOREACH_Difficulty #define FOREACH_ShownCourseDifficulty( cd ) for( Difficulty cd=GetNextShownCourseDifficulty((CourseDifficulty)-1); cd!=Difficulty_Invalid; cd=GetNextShownCourseDifficulty(cd) )