This commit is contained in:
Chris Danford
2005-02-23 05:51:10 +00:00
parent b9d6d7649f
commit 21f6266517
2 changed files with 12 additions and 8 deletions
+1 -1
View File
@@ -981,7 +981,7 @@ void ScreenOptions::ChangeValueInRow( PlayerNumber pn, int iDelta, bool Repeat )
FOREACH_HumanPlayer( p ) FOREACH_HumanPlayer( p )
{ {
row.m_iChoiceInRowWithFocus[p] = iNewChoiceWithFocus; row.m_iChoiceInRowWithFocus[p] = iNewChoiceWithFocus;
StoreFocus( pn ); StoreFocus( p );
} }
} }
+11 -7
View File
@@ -103,6 +103,7 @@ void ScreenOptionsMaster::SetList( OptionRowDefinition &row, OptionRowHandler &h
} }
} }
else if( sName == "exportonchange" ) hand.m_bExportOnChange = true; else if( sName == "exportonchange" ) hand.m_bExportOnChange = true;
else RageException::Throw( "Unkown row flag \"%s\"", sName.c_str() );
} }
for( int col = 0; col < NumCols; ++col ) for( int col = 0; col < NumCols; ++col )
@@ -472,24 +473,27 @@ ScreenOptionsMaster::ScreenOptionsMaster( CString sClassName ):
for( unsigned i = 0; i < Flags.size(); ++i ) for( unsigned i = 0; i < Flags.size(); ++i )
{ {
Flags[i].MakeLower(); CString sFlag = Flags[i];
sFlag.MakeLower();
if( Flags[i] == "together" ) if( sFlag == "together" )
im = INPUTMODE_SHARE_CURSOR; im = INPUTMODE_SHARE_CURSOR;
if( Flags[i] == "explanations" ) else if( sFlag == "explanations" )
Explanations = true; Explanations = true;
if( Flags[i] == "forceallplayers" ) else if( sFlag == "forceallplayers" )
{ {
FOREACH_PlayerNumber( pn ) FOREACH_PlayerNumber( pn )
GAMESTATE->m_bSideIsJoined[pn] = true; GAMESTATE->m_bSideIsJoined[pn] = true;
GAMESTATE->m_MasterPlayerNumber = PlayerNumber(0); GAMESTATE->m_MasterPlayerNumber = PlayerNumber(0);
} }
if( Flags[i] == "smnavigation" ) else if( sFlag == "smnavigation" )
SetNavigation( NAV_THREE_KEY_MENU ); SetNavigation( NAV_THREE_KEY_MENU );
if( Flags[i] == "toggle" || Flags[i] == "firstchoicegoesdown" ) else if( sFlag == "toggle" || sFlag == "firstchoicegoesdown" )
SetNavigation( PREFSMAN->m_bArcadeOptionsNavigation? NAV_TOGGLE_THREE_KEY:NAV_TOGGLE_FIVE_KEY ); SetNavigation( PREFSMAN->m_bArcadeOptionsNavigation? NAV_TOGGLE_THREE_KEY:NAV_TOGGLE_FIVE_KEY );
if( Flags[i] == "hideunderlines" ) else if( sFlag == "hideunderlines" )
bShowUnderlines = false; bShowUnderlines = false;
else
RageException::Throw( "Unknown flag \"%s\"", sFlag.c_str() );
} }
m_OptionRowAlloc = new OptionRowDefinition[asLineNames.size()]; m_OptionRowAlloc = new OptionRowDefinition[asLineNames.size()];