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

merge code paths

Browse Source
This commit is contained in:
Glenn Maynard
2006-01-19 01:56:40 +00:00
parent f3545a331d
commit 7e261bb44b
1 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptions.cpp
+4 -15
View File
@@ -1072,9 +1072,13 @@ void ScreenOptions::ChangeValueInRowRelative( int iRow, PlayerNumber pn, int iDe
StoreFocus( p ); StoreFocus( p );
} }
} }
}
FOREACH_PlayerNumber( p ) FOREACH_PlayerNumber( p )
{ {
if( !row.GetRowDef().m_bOneChoiceForAllPlayers && p != pn )
continue;
if( m_OptionsNavigation==NAV_TOGGLE_THREE_KEY || m_OptionsNavigation==NAV_TOGGLE_FIVE_KEY ) if( m_OptionsNavigation==NAV_TOGGLE_THREE_KEY || m_OptionsNavigation==NAV_TOGGLE_FIVE_KEY )
{ {
; // do nothing ; // do nothing
@@ -1087,21 +1091,6 @@ void ScreenOptions::ChangeValueInRowRelative( int iRow, PlayerNumber pn, int iDe
row.SetOneSelection( p, iNewChoiceWithFocus ); row.SetOneSelection( p, iNewChoiceWithFocus );
} }
} }
}
else
{
if( m_OptionsNavigation==NAV_TOGGLE_THREE_KEY || m_OptionsNavigation==NAV_TOGGLE_FIVE_KEY )
{
; // do nothing
}
else
{
if( row.GetRowDef().m_selectType == SELECT_MULTIPLE )
; // do nothing. User must press Start to toggle the selection.
else
row.SetOneSelection( pn, iNewChoiceWithFocus );
}
}
// XXX: What was this NAV_THREE_KEY_MENU special case for? // XXX: What was this NAV_THREE_KEY_MENU special case for?
if( bOneChanged ) if( bOneChanged )