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

tolerate no default selection

Browse Source
This commit is contained in:
Glenn Maynard
2004-02-25 23:56:33 +00:00
parent 6ed4e02417
commit 572a914f9f
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptions.cpp
+14 -4
View File
@@ -155,25 +155,35 @@ void ScreenOptions::Init( InputMode im, OptionRowData OptionRows[], int iNumOpti
this->ImportOptions(); this->ImportOptions();
// Make all selections the same if bOneChoiceForAllPlayers
{ {
for( int r=0; r<iNumOptionLines; r++ ) // foreach row for( int r=0; r<iNumOptionLines; r++ ) // foreach row
{ {
Row &Row = *m_Rows[r]; Row &Row = *m_Rows[r];
// Make all selections the same if bOneChoiceForAllPlayers
if( Row.m_RowDef.bOneChoiceForAllPlayers ) if( Row.m_RowDef.bOneChoiceForAllPlayers )
{
// set the selection to be the same for all players
for( int p=1; p<NUM_PLAYERS; p++ ) for( int p=1; p<NUM_PLAYERS; p++ )
Row.m_vbSelected[p] = m_Rows[r]->m_vbSelected[0]; Row.m_vbSelected[p] = m_Rows[r]->m_vbSelected[0];
}
CHECKPOINT_M( ssprintf("row %i: %s", r, Row.m_RowDef.name.c_str()) ); CHECKPOINT_M( ssprintf("row %i: %s", r, Row.m_RowDef.name.c_str()) );
for( int p=0; p<NUM_PLAYERS; p++ ) for( int p=0; p<NUM_PLAYERS; p++ )
if( m_OptionsNavigation==NAV_FIRST_CHOICE_GOES_DOWN ) if( m_OptionsNavigation==NAV_FIRST_CHOICE_GOES_DOWN )
Row.m_iChoiceWithFocus[p] = 0; // focus on the first row, which is "go down" Row.m_iChoiceWithFocus[p] = 0; // focus on the first row, which is "go down"
else else
{
/* Make sure the row actually has a selection. */
bool bHasSelection = false;
for( unsigned i=0; i<Row.m_vbSelected[p].size(); i++ )
if( Row.m_vbSelected[p][i] )
bHasSelection = true;
if( !bHasSelection )
{
LOG->Warn( "Options menu \"%s\" row %i has no selection", m_sName.c_str(), i );
Row.m_vbSelected[p][0] = true;
}
Row.m_iChoiceWithFocus[p] = Row.GetOneSelection( (PlayerNumber)p); // focus on the only selected choice Row.m_iChoiceWithFocus[p] = Row.GetOneSelection( (PlayerNumber)p); // focus on the only selected choice
}
} }
} }