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

cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2004-12-07 02:42:50 +00:00
parent 63e2b2be99
commit d3180e8690
2 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptionsMaster.cpp
+8 -16
View File
@@ -34,11 +34,11 @@
#define PREV_SCREEN THEME->GetMetric (m_sName,"PrevScreen") #define PREV_SCREEN THEME->GetMetric (m_sName,"PrevScreen")
/* Add the list named "ListName" to the given row/handler. */ /* Add the list named "ListName" to the given row/handler. */
void ScreenOptionsMaster::SetList( OptionRowData &row, OptionRowHandler &hand, CString ListName, CString &TitleOut ) void ScreenOptionsMaster::SetList( OptionRowData &row, OptionRowHandler &hand, CString ListName )
{ {
hand.type = ROW_LIST; hand.type = ROW_LIST;
TitleOut = ListName; row.name = ListName;
if( !ListName.CompareNoCase("noteskins") ) if( !ListName.CompareNoCase("noteskins") )
{ {
hand.Default.Init(); /* none */ hand.Default.Init(); /* none */
@@ -100,6 +100,7 @@ void ScreenOptionsMaster::SetList( OptionRowData &row, OptionRowHandler &hand, C
void ScreenOptionsMaster::SetStep( OptionRowData &row, OptionRowHandler &hand ) void ScreenOptionsMaster::SetStep( OptionRowData &row, OptionRowHandler &hand )
{ {
hand.type = ROW_STEP; hand.type = ROW_STEP;
row.name = "Steps";
row.bOneChoiceForAllPlayers = false; row.bOneChoiceForAllPlayers = false;
// fill in difficulty names // fill in difficulty names
@@ -152,7 +153,7 @@ void ScreenOptionsMaster::SetStep( OptionRowData &row, OptionRowHandler &hand )
/* Add the given configuration value to the given row/handler. */ /* Add the given configuration value to the given row/handler. */
void ScreenOptionsMaster::SetConf( OptionRowData &row, OptionRowHandler &hand, CString param, CString &TitleOut ) void ScreenOptionsMaster::SetConf( OptionRowData &row, OptionRowHandler &hand, CString param )
{ {
/* Configuration values are never per-player. */ /* Configuration values are never per-player. */
row.bOneChoiceForAllPlayers = true; row.bOneChoiceForAllPlayers = true;
@@ -164,7 +165,7 @@ void ScreenOptionsMaster::SetConf( OptionRowData &row, OptionRowHandler &hand, C
hand.opt->MakeOptionsList( row.choices ); hand.opt->MakeOptionsList( row.choices );
TitleOut = hand.opt->name; row.name = hand.opt->name;
} }
/* Add a list of available characters to the given row/handler. */ /* Add a list of available characters to the given row/handler. */
@@ -172,6 +173,7 @@ void ScreenOptionsMaster::SetCharacter( OptionRowData &row, OptionRowHandler &ha
{ {
hand.type = ROW_CHARACTER; hand.type = ROW_CHARACTER;
row.bOneChoiceForAllPlayers = false; row.bOneChoiceForAllPlayers = false;
row.name = "Characters";
hand.Default.m_pCharacter = GAMESTATE->GetDefaultCharacter(); hand.Default.m_pCharacter = GAMESTATE->GetDefaultCharacter();
{ {
@@ -265,23 +267,13 @@ ScreenOptionsMaster::ScreenOptionsMaster( CString sClassName ):
const CString &name = command.GetName(); const CString &name = command.GetName();
if( !name.CompareNoCase("list") ) if( !name.CompareNoCase("list") )
{ SetList( row, hand, sArg(1) );
SetList( row, hand, sArg(1), row.name );
}
else if( !name.CompareNoCase("steps") ) else if( !name.CompareNoCase("steps") )
{
SetStep( row, hand ); SetStep( row, hand );
row.name = "Steps";
}
else if( !name.CompareNoCase("conf") ) else if( !name.CompareNoCase("conf") )
{ SetConf( row, hand, sArg(1) );
SetConf( row, hand, sArg(1), row.name );
}
else if( !name.CompareNoCase("characters") ) else if( !name.CompareNoCase("characters") )
{
SetCharacter( row, hand ); SetCharacter( row, hand );
row.name = "Characters";
}
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 );
stepmania/src/ScreenOptionsMaster.h
+2 -2
View File
@@ -44,9 +44,9 @@ private:
int ExportOption( const OptionRowData &row, const OptionRowHandler &hand, PlayerNumber pn, const vector<bool> &vbSelected ); int ExportOption( const OptionRowData &row, const OptionRowHandler &hand, PlayerNumber pn, const vector<bool> &vbSelected );
void ImportOption( const OptionRowData &row, const OptionRowHandler &hand, PlayerNumber pn, int rowno, vector<bool> &vbSelectedOut ); void ImportOption( const OptionRowData &row, const OptionRowHandler &hand, PlayerNumber pn, int rowno, vector<bool> &vbSelectedOut );
void SetList( OptionRowData &row, OptionRowHandler &hand, CString param, CString &TitleOut ); void SetList( OptionRowData &row, OptionRowHandler &hand, CString param );
void SetStep( OptionRowData &row, OptionRowHandler &hand ); void SetStep( OptionRowData &row, OptionRowHandler &hand );
void SetConf( OptionRowData &row, OptionRowHandler &hand, CString param, CString &TitleOut ); void SetConf( OptionRowData &row, OptionRowHandler &hand, CString param );
void SetCharacter( OptionRowData &row, OptionRowHandler &hand ); void SetCharacter( OptionRowData &row, OptionRowHandler &hand );
protected: protected: