This commit is contained in:
Steve Checkoway
2006-06-24 04:42:49 +00:00
parent dcea3319ca
commit 08146691e7
+14 -12
View File
@@ -11,20 +11,20 @@
#include "ScreenDimensions.h" #include "ScreenDimensions.h"
#include "Command.h" #include "Command.h"
#define NUM_CHOICES_ON_PAGE_1 THEME->GetMetricI(m_sName,"NumChoicesOnPage1") #define NUM_CHOICES_ON_PAGE_1 THEME->GetMetricI(m_sName,"NumChoicesOnPage1")
#define LOCK_INPUT_SECONDS THEME->GetMetricF(m_sName,"LockInputSeconds") #define LOCK_INPUT_SECONDS THEME->GetMetricF(m_sName,"LockInputSeconds")
#define SLEEP_AFTER_CHOICE_SECONDS THEME->GetMetricF(m_sName,"SleepAfterChoiceSeconds") #define SLEEP_AFTER_CHOICE_SECONDS THEME->GetMetricF(m_sName,"SleepAfterChoiceSeconds")
#define CURSOR_CHOOSE_COMMAND THEME->GetMetricA(m_sName,"CursorChooseCommand") #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_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 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_CHOOSE_COMMAND THEME->GetMetricA(m_sName,"ShadowChooseCommand")
#define SHADOW_LENGTH_X THEME->GetMetricF(m_sName,"ShadowLengthX") #define SHADOW_LENGTH_X THEME->GetMetricF(m_sName,"ShadowLengthX")
#define SHADOW_LENGTH_Y THEME->GetMetricF(m_sName,"ShadowLengthY") #define SHADOW_LENGTH_Y THEME->GetMetricF(m_sName,"ShadowLengthY")
#define OK_CHOOSE_COMMAND THEME->GetMetricA(m_sName,"OKChooseCommand") #define OK_CHOOSE_COMMAND THEME->GetMetricA(m_sName,"OKChooseCommand")
#define ENABLED_COMMAND THEME->GetMetricA(m_sName,"EnabledCommand") #define ENABLED_COMMAND THEME->GetMetricA(m_sName,"EnabledCommand")
#define DISABLED_COMMAND THEME->GetMetricA(m_sName,"DisabledCommand") #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 ); REGISTER_SCREEN_CLASS( ScreenSelectDifficulty );
@@ -316,7 +316,9 @@ void ScreenSelectDifficulty::ChangePage( Page newPage )
break; break;
} }
} }
} else { }
else
{
for( unsigned i=0; i<m_GameCommands[newPage].size(); i++ ) for( unsigned i=0; i<m_GameCommands[newPage].size(); i++ )
{ {
if( m_GameCommands[newPage][i].IsPlayable() ) if( m_GameCommands[newPage][i].IsPlayable() )