actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

NumCodes -> CodeNames

Browse Source
This commit is contained in:
Chris Danford
2005-01-05 04:34:35 +00:00
parent 1a5d766b01
commit 910f9d75ba
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelect.cpp
+9 -6
View File
@@ -20,10 +20,9 @@
#define CHOICE_NAMES THEME->GetMetric (m_sName,"ChoiceNames") #define CHOICE_NAMES THEME->GetMetric (m_sName,"ChoiceNames")
#define CHOICE( sChoiceName ) THEME->GetMetricA(m_sName,ssprintf("Choice%s",sChoiceName.c_str())) #define CHOICE( sChoiceName ) THEME->GetMetricA(m_sName,ssprintf("Choice%s",sChoiceName.c_str()))
#define NUM_CODES THEME->GetMetricI(m_sName,"NumCodes") #define CODE_NAMES THEME->GetMetric (m_sName,"CodeNames")
#define CODE( c ) THEME->GetMetric (m_sName,ssprintf("Code%d",c+1)) #define CODE( c ) THEME->GetMetric (m_sName,ssprintf("Code%d",c+1))
#define CODE_ACTION( c ) THEME->GetMetricA(m_sName,ssprintf("Code%dAction",c+1)) #define CODE_ACTION( c ) THEME->GetMetricA(m_sName,ssprintf("Code%dAction",c+1))
#define HELP_TEXT THEME->GetMetric (m_sName,"HelpText")
#define NEXT_SCREEN( c ) THEME->GetMetric (m_sName,ssprintf("NextScreen%d",c+1)) #define NEXT_SCREEN( c ) THEME->GetMetric (m_sName,ssprintf("NextScreen%d",c+1))
#define IDLE_TIMEOUT_SCREEN THEME->GetMetric (m_sName,"IdleTimeoutScreen") #define IDLE_TIMEOUT_SCREEN THEME->GetMetric (m_sName,"IdleTimeoutScreen")
#define ALLOW_DISABLED_PLAYER_INPUT THEME->GetMetricB(m_sName,"AllowDisabledPlayerInput") #define ALLOW_DISABLED_PLAYER_INPUT THEME->GetMetricB(m_sName,"AllowDisabledPlayerInput")
@@ -35,9 +34,6 @@ ScreenSelect::ScreenSelect( CString sClassName ) :
{ {
LOG->Trace( "ScreenSelect::ScreenSelect()" ); LOG->Trace( "ScreenSelect::ScreenSelect()" );
IDLE_COMMENT_SECONDS.Read();
IDLE_TIMEOUT_SECONDS.Read();
m_sName = sClassName; m_sName = sClassName;
// //
@@ -71,8 +67,14 @@ ScreenSelect::ScreenSelect( CString sClassName ) :
// //
// Load codes // Load codes
// //
for( int c=0; c<NUM_CODES; c++ )
{ {
CStringArray vsCodeNames;
split( CODE_NAMES, ",", vsCodeNames, true );
for( unsigned c=0; c<vsCodeNames.size(); c++ )
{
CString sCodeName = vsCodeNames[c];
CodeItem code; CodeItem code;
if( !code.Load( CODE(c) ) ) if( !code.Load( CODE(c) ) )
continue; continue;
@@ -82,6 +84,7 @@ ScreenSelect::ScreenSelect( CString sClassName ) :
mc.Load( c, CODE_ACTION(c) ); mc.Load( c, CODE_ACTION(c) );
m_aCodeChoices.push_back( mc ); m_aCodeChoices.push_back( mc );
} }
}
if( !m_aGameCommands.size() ) if( !m_aGameCommands.size() )
RageException::Throw( "Screen \"%s\" does not set any choices", m_sName.c_str() ); RageException::Throw( "Screen \"%s\" does not set any choices", m_sName.c_str() );