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

Fix crash, add asserts, cleanup.

Browse Source
This commit is contained in:
Glenn Maynard
2003-10-01 10:04:23 +00:00
parent c7de8342f5
commit edf76805d0
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptionsMaster.cpp
+4 -2
View File
@@ -162,6 +162,7 @@ void ScreenOptionsMaster::SetConf( OptionRow &row, OptionRowHandler &hand, CStri
/* Add a list of available characters to the given row/handler. */ /* Add a list of available characters to the given row/handler. */
void ScreenOptionsMaster::SetCharacter( OptionRow &row, OptionRowHandler &hand ) void ScreenOptionsMaster::SetCharacter( OptionRow &row, OptionRowHandler &hand )
{ {
hand.type = ROW_CHARACTER;
row.bOneChoiceForAllPlayers = false; row.bOneChoiceForAllPlayers = false;
row.choices.push_back( "OFF" ); row.choices.push_back( "OFF" );
vector<Character*> apCharacters; vector<Character*> apCharacters;
@@ -370,6 +371,7 @@ void ScreenOptionsMaster::ImportOptions()
{ {
int col = ImportOption( row, hand, 0 ); int col = ImportOption( row, hand, 0 );
m_iSelectedOption[0][i] = col; m_iSelectedOption[0][i] = col;
ASSERT( m_iSelectedOption[0][i] < (int)row.choices.size() );
} }
else else
for( int pn=0; pn<NUM_PLAYERS; pn++ ) for( int pn=0; pn<NUM_PLAYERS; pn++ )
@@ -379,6 +381,7 @@ void ScreenOptionsMaster::ImportOptions()
int col = ImportOption( row, hand, pn ); int col = ImportOption( row, hand, pn );
m_iSelectedOption[pn][i] = col; m_iSelectedOption[pn][i] = col;
ASSERT( m_iSelectedOption[pn][i] < (int)row.choices.size() );
} }
} }
} }
@@ -407,10 +410,8 @@ int ScreenOptionsMaster::ExportOption( const OptionRow &row, const OptionRowHand
int New = hand.opt->Get( row.choices ); int New = hand.opt->Get( row.choices );
/* If it didn't change, don't return any side-effects. */ /* If it didn't change, don't return any side-effects. */
LOG->Trace("origin %i, %i %s", Original, New, hand.opt->name.c_str());
if( Original == New ) if( Original == New )
return 0; return 0;
LOG->Trace("foo %i", hand.opt->GetEffects());
return hand.opt->GetEffects(); return hand.opt->GetEffects();
} }
@@ -422,6 +423,7 @@ int ScreenOptionsMaster::ExportOption( const OptionRow &row, const OptionRowHand
{ {
vector<Character*> apCharacters; vector<Character*> apCharacters;
GAMESTATE->GetCharacters( apCharacters ); GAMESTATE->GetCharacters( apCharacters );
ASSERT( sel - 1 < (int)apCharacters.size() );
GAMESTATE->m_pCurCharacters[pn] = apCharacters[sel - 1]; GAMESTATE->m_pCurCharacters[pn] = apCharacters[sel - 1];
} }
break; break;