diff --git a/stepmania/src/ScreenSelectDifficulty.cpp b/stepmania/src/ScreenSelectDifficulty.cpp index f87bdeb01b..9992ce169a 100644 --- a/stepmania/src/ScreenSelectDifficulty.cpp +++ b/stepmania/src/ScreenSelectDifficulty.cpp @@ -11,20 +11,20 @@ #include "ScreenDimensions.h" #include "Command.h" -#define NUM_CHOICES_ON_PAGE_1 THEME->GetMetricI(m_sName,"NumChoicesOnPage1") -#define LOCK_INPUT_SECONDS THEME->GetMetricF(m_sName,"LockInputSeconds") -#define SLEEP_AFTER_CHOICE_SECONDS THEME->GetMetricF(m_sName,"SleepAfterChoiceSeconds") -#define CURSOR_CHOOSE_COMMAND THEME->GetMetricA(m_sName,"CursorChooseCommand") +#define NUM_CHOICES_ON_PAGE_1 THEME->GetMetricI(m_sName,"NumChoicesOnPage1") +#define LOCK_INPUT_SECONDS THEME->GetMetricF(m_sName,"LockInputSeconds") +#define SLEEP_AFTER_CHOICE_SECONDS THEME->GetMetricF(m_sName,"SleepAfterChoiceSeconds") +#define CURSOR_CHOOSE_COMMAND THEME->GetMetricA(m_sName,"CursorChooseCommand") #define CURSOR_OFFSET_X_FROM_PICTURE( p ) THEME->GetMetricF(m_sName,ssprintf("CursorP%dOffsetXFromPicture",p+1)) #define CURSOR_OFFSET_Y_FROM_PICTURE( p ) THEME->GetMetricF(m_sName,ssprintf("CursorP%dOffsetYFromPicture",p+1)) -#define SHADOW_CHOOSE_COMMAND THEME->GetMetricA(m_sName,"ShadowChooseCommand") -#define SHADOW_LENGTH_X THEME->GetMetricF(m_sName,"ShadowLengthX") -#define SHADOW_LENGTH_Y THEME->GetMetricF(m_sName,"ShadowLengthY") -#define OK_CHOOSE_COMMAND THEME->GetMetricA(m_sName,"OKChooseCommand") -#define ENABLED_COMMAND THEME->GetMetricA(m_sName,"EnabledCommand") -#define DISABLED_COMMAND THEME->GetMetricA(m_sName,"DisabledCommand") +#define SHADOW_CHOOSE_COMMAND THEME->GetMetricA(m_sName,"ShadowChooseCommand") +#define SHADOW_LENGTH_X THEME->GetMetricF(m_sName,"ShadowLengthX") +#define SHADOW_LENGTH_Y THEME->GetMetricF(m_sName,"ShadowLengthY") +#define OK_CHOOSE_COMMAND THEME->GetMetricA(m_sName,"OKChooseCommand") +#define ENABLED_COMMAND THEME->GetMetricA(m_sName,"EnabledCommand") +#define DISABLED_COMMAND THEME->GetMetricA(m_sName,"DisabledCommand") -#define IGNORED_ELEMENT_COMMAND THEME->GetMetricA(m_sName,"IgnoredElementOnCommand") +#define IGNORED_ELEMENT_COMMAND THEME->GetMetricA(m_sName,"IgnoredElementOnCommand") REGISTER_SCREEN_CLASS( ScreenSelectDifficulty ); @@ -316,7 +316,9 @@ void ScreenSelectDifficulty::ChangePage( Page newPage ) break; } } - } else { + } + else + { for( unsigned i=0; i