From 21f6266517e8334ec3f57c2e93792e4b58674515 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Wed, 23 Feb 2005 05:51:10 +0000
Subject: [PATCH] cleanup

---
 stepmania/src/ScreenOptions.cpp       |  2 +-
 stepmania/src/ScreenOptionsMaster.cpp | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index 1dc9281422..94087604a1 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -981,7 +981,7 @@ void ScreenOptions::ChangeValueInRow( PlayerNumber pn, int iDelta, bool Repeat )
 			FOREACH_HumanPlayer( p )
 			{
 				row.m_iChoiceInRowWithFocus[p] = iNewChoiceWithFocus;
-				StoreFocus( pn );
+				StoreFocus( p );
 			}
 		}
 
diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp
index 00d82a1534..786714b5c4 100644
--- a/stepmania/src/ScreenOptionsMaster.cpp
+++ b/stepmania/src/ScreenOptionsMaster.cpp
@@ -103,6 +103,7 @@ void ScreenOptionsMaster::SetList( OptionRowDefinition &row, OptionRowHandler &h
 			}
 		}
 		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 )
@@ -472,24 +473,27 @@ ScreenOptionsMaster::ScreenOptionsMaster( CString sClassName ):
 	
 	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;
-		if( Flags[i] == "explanations" )
+		else if( sFlag == "explanations" )
 			Explanations = true;
-		if( Flags[i] == "forceallplayers" )
+		else if( sFlag == "forceallplayers" )
 		{
 			FOREACH_PlayerNumber( pn )
 				GAMESTATE->m_bSideIsJoined[pn] = true;
 			GAMESTATE->m_MasterPlayerNumber = PlayerNumber(0);
 		}
-		if( Flags[i] == "smnavigation" )
+		else if( sFlag == "smnavigation" )
 			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 );
-		if( Flags[i] == "hideunderlines" )
+		else if( sFlag == "hideunderlines" )
 			bShowUnderlines = false;
+		else
+			RageException::Throw( "Unknown flag \"%s\"", sFlag.c_str() );
 	}
 
 	m_OptionRowAlloc = new OptionRowDefinition[asLineNames.size()];