cleanup "smnavigation" flag

fix left/right act as up/down on options menu
never play change line sound when the option didn't change
This commit is contained in:
Glenn Maynard
2004-01-09 04:43:27 +00:00
parent 35a7bbbe61
commit 99b000129b
4 changed files with 30 additions and 37 deletions
+1 -14
View File
@@ -180,8 +180,6 @@ ScreenOptionsMaster::ScreenOptionsMaster( CString sClassName ):
if( MusicPath != "" )
SOUND->PlayMusic( MusicPath );
m_ForceSMOptionsNavigation = false;
CStringArray Flags;
split( OPTION_MENU_FLAGS, ";", Flags, true );
InputMode im = INPUTMODE_INDIVIDUAL;
@@ -206,7 +204,7 @@ ScreenOptionsMaster::ScreenOptionsMaster( CString sClassName ):
GAMESTATE->m_MasterPlayerNumber = PlayerNumber(0);
}
if( Flags[i] == "smnavigation" )
m_ForceSMOptionsNavigation = true;
SetSMOptionsNavigation( true );
}
if( NumRows == -1 )
@@ -550,17 +548,6 @@ void ScreenOptionsMaster::ExportOptions()
CHECKPOINT;
}
void ScreenOptionsMaster::MenuStart( PlayerNumber pn, const InputEventType type )
{
if( m_ForceSMOptionsNavigation )
{
StartGoToNextState();
return;
}
ScreenOptions::MenuStart( pn, type );
}
void ScreenOptionsMaster::GoToNextState()
{
if( GAMESTATE->m_bEditing )