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

using ParseCommand to parse options row data

Browse Source
This commit is contained in:
Chris Danford
2004-01-10 20:43:32 +00:00
parent f7647ae391
commit 26ef62415e
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptions.h
+2 -2
View File
@@ -27,8 +27,8 @@ struct OptionRowData
{ {
CString name; CString name;
bool bOneChoiceForAllPlayers; bool bOneChoiceForAllPlayers;
vector<CString> choices;
bool bMultiSelect; bool bMultiSelect;
vector<CString> choices;
OptionRowData(): name(""), bOneChoiceForAllPlayers(false), bMultiSelect(false) { } OptionRowData(): name(""), bOneChoiceForAllPlayers(false), bMultiSelect(false) { }
@@ -36,10 +36,10 @@ struct OptionRowData
{ {
name = n; name = n;
bOneChoiceForAllPlayers = !!b; bOneChoiceForAllPlayers = !!b;
bMultiSelect = false;
#define PUSH( c ) if(c) choices.push_back(c); #define PUSH( c ) if(c) choices.push_back(c);
PUSH(c0);PUSH(c1);PUSH(c2);PUSH(c3);PUSH(c4);PUSH(c5);PUSH(c6);PUSH(c7);PUSH(c8);PUSH(c9);PUSH(c10);PUSH(c11);PUSH(c12);PUSH(c13);PUSH(c14);PUSH(c15);PUSH(c16);PUSH(c17);PUSH(c18);PUSH(c19); PUSH(c0);PUSH(c1);PUSH(c2);PUSH(c3);PUSH(c4);PUSH(c5);PUSH(c6);PUSH(c7);PUSH(c8);PUSH(c9);PUSH(c10);PUSH(c11);PUSH(c12);PUSH(c13);PUSH(c14);PUSH(c15);PUSH(c16);PUSH(c17);PUSH(c18);PUSH(c19);
#undef PUSH #undef PUSH
bMultiSelect = false;
} }
}; };
stepmania/src/ScreenOptionsMaster.cpp
+15 -10
View File
@@ -218,23 +218,26 @@ ScreenOptionsMaster::ScreenOptionsMaster( CString sClassName ):
{ {
OptionRowData &row = m_OptionRowAlloc[i]; OptionRowData &row = m_OptionRowAlloc[i];
CStringArray asParts; CString sRowCommands = ROW_LINE(i);
split( ROW_LINE(i), ";", asParts );
if( asParts.size() < 1 ) vector<ParsedCommand> vCommands;
ParseCommands( sRowCommands, vCommands );
if( vCommands.size() < 1 )
RageException::Throw( "Parse error in %s::Line%i", m_sName.c_str(), i+1 ); RageException::Throw( "Parse error in %s::Line%i", m_sName.c_str(), i+1 );
OptionRowHandler hand; OptionRowHandler hand;
for( unsigned part = 0; part < asParts.size(); ++part) for( unsigned part = 0; part < vCommands.size(); ++part)
{ {
CStringArray asBits; ParsedCommand& command = vCommands[part];
split( asParts[part], ",", asBits );
const CString name = asBits[0]; HandleParams;
const CString param = asBits.size() > 1? asBits[1]: "";
const CString name = sParam(0);
if( !name.CompareNoCase("list") ) if( !name.CompareNoCase("list") )
{ {
SetList( row, hand, param, row.name ); SetList( row, hand, sParam(1), row.name );
} }
else if( !name.CompareNoCase("steps") ) else if( !name.CompareNoCase("steps") )
{ {
@@ -243,7 +246,7 @@ ScreenOptionsMaster::ScreenOptionsMaster( CString sClassName ):
} }
else if( !name.CompareNoCase("conf") ) else if( !name.CompareNoCase("conf") )
{ {
SetConf( row, hand, param, row.name ); SetConf( row, hand, sParam(1), row.name );
} }
else if( !name.CompareNoCase("characters") ) else if( !name.CompareNoCase("characters") )
{ {
@@ -257,6 +260,8 @@ ScreenOptionsMaster::ScreenOptionsMaster( CString sClassName ):
} }
else else
RageException::Throw( "Unexpected type '%s' in %s::Line%i", name.c_str(), m_sName.c_str(), i ); RageException::Throw( "Unexpected type '%s' in %s::Line%i", name.c_str(), m_sName.c_str(), i );
CheckHandledParams;
} }
OptionRowHandlers.push_back( hand ); OptionRowHandlers.push_back( hand );
} }