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

fix crash on change row if all rows disabled

Browse Source
This commit is contained in:
Chris Danford
2005-03-25 04:23:57 +00:00
parent c2a776661d
commit 24df996776
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptions.cpp
+8 -5
View File
@@ -887,14 +887,17 @@ void ScreenOptions::StoreFocus( PlayerNumber pn )
void ScreenOptions::ChangeValueInRow( PlayerNumber pn, int iDelta, bool Repeat ) void ScreenOptions::ChangeValueInRow( PlayerNumber pn, int iDelta, bool Repeat )
{ {
const int iCurRow = m_iCurrentRow[pn]; const int iCurRow = m_iCurrentRow[pn];
if( iCurRow == -1 ) // no row selected
return; // don't allow a move
OptionRow &row = *m_Rows[iCurRow]; OptionRow &row = *m_Rows[iCurRow];
if( row.GetRowType() == OptionRow::ROW_EXIT ) // EXIT is selected if( row.GetRowType() == OptionRow::ROW_EXIT ) // EXIT is selected
return; // don't allow a move return; // don't allow a move
const int iNumOptions = row.GetRowDef().choices.size(); const int iNumChoices = row.GetRowDef().choices.size();
if( m_OptionsNavigation == NAV_THREE_KEY_MENU && iNumOptions <= 1 ) // 1 or 0 if( m_OptionsNavigation == NAV_THREE_KEY_MENU && iNumChoices <= 1 ) // 1 or 0
{ {
/* There are no other options on the row; move up or down instead of left and right. /* There are no other options on the row; move up or down instead of left and right.
* This allows navigating the options menu with left/right/start. * This allows navigating the options menu with left/right/start.
@@ -905,7 +908,7 @@ void ScreenOptions::ChangeValueInRow( PlayerNumber pn, int iDelta, bool Repeat )
return; return;
} }
if( iNumOptions == 0 ) if( iNumChoices == 0 )
return; return;
if( Repeat ) if( Repeat )
@@ -916,8 +919,8 @@ void ScreenOptions::ChangeValueInRow( PlayerNumber pn, int iDelta, bool Repeat )
int iCurrentChoiceWithFocus = row.GetChoiceInRowWithFocus(pn); int iCurrentChoiceWithFocus = row.GetChoiceInRowWithFocus(pn);
int iNewChoiceWithFocus = iCurrentChoiceWithFocus + iDelta; int iNewChoiceWithFocus = iCurrentChoiceWithFocus + iDelta;
ASSERT( iNumOptions > 0 ); ASSERT( iNumChoices > 0 );
wrap( iNewChoiceWithFocus, iNumOptions ); wrap( iNewChoiceWithFocus, iNumChoices );
if( iCurrentChoiceWithFocus != iNewChoiceWithFocus ) if( iCurrentChoiceWithFocus != iNewChoiceWithFocus )
bOneChanged = true; bOneChanged = true;