From 06e94c8b8cddc840c51872d7bd5b080cfa634431 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 16 Jan 2006 03:25:30 +0000 Subject: [PATCH] add NavigationMode (OptionMenuFlags predated metric fallback logic, where we didn't want to add a ton of flags that we'd have to duplicate in a bunch of screens.) --- stepmania/src/ScreenOptionsMaster.cpp | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp index 0126b74485..6696585fbc 100644 --- a/stepmania/src/ScreenOptionsMaster.cpp +++ b/stepmania/src/ScreenOptionsMaster.cpp @@ -17,10 +17,10 @@ #include "CommonMetrics.h" #define LINE_NAMES THEME->GetMetric (m_sName,"LineNames") -#define OPTION_MENU_FLAGS THEME->GetMetric (m_sName,"OptionMenuFlags") #define LINE(sLineName) THEME->GetMetric (m_sName,ssprintf("Line%s",sLineName.c_str())) #define FORCE_ALL_PLAYERS THEME->GetMetricB(m_sName,"ForceAllPlayers") #define INPUT_MODE THEME->GetMetric (m_sName,"InputMode") +#define NAVIGATION_MODE THEME->GetMetric (m_sName,"NavigationMode") REGISTER_SCREEN_CLASS( ScreenOptionsMaster ); @@ -32,10 +32,6 @@ void ScreenOptionsMaster::Init() if( asLineNames.empty() ) RageException::Throw( "%s::LineNames is empty.", m_sName.c_str() ); - - vector Flags; - split( OPTION_MENU_FLAGS, ";", Flags, true ); - if( FORCE_ALL_PLAYERS ) { FOREACH_PlayerNumber( pn ) @@ -43,18 +39,10 @@ void ScreenOptionsMaster::Init() GAMESTATE->m_MasterPlayerNumber = PLAYER_1; } - for( unsigned i = 0; i < Flags.size(); ++i ) - { - CString sFlag = Flags[i]; - sFlag.MakeLower(); - - if( sFlag == "smnavigation" ) - SetNavigation( NAV_THREE_KEY_MENU ); - else if( sFlag == "toggle" ) - SetNavigation( PREFSMAN->m_bArcadeOptionsNavigation? NAV_TOGGLE_THREE_KEY:NAV_TOGGLE_FIVE_KEY ); - else - RageException::Throw( "Unknown flag \"%s\"", sFlag.c_str() ); - } + if( NAVIGATION_MODE == "toggle" ) + SetNavigation( PREFSMAN->m_bArcadeOptionsNavigation? NAV_TOGGLE_THREE_KEY:NAV_TOGGLE_FIVE_KEY ); + else if( NAVIGATION_MODE == "menu" ) + SetNavigation( NAV_THREE_KEY_MENU ); SetInputMode( StringToInputMode(INPUT_MODE) );