From 2f7e332d6bf6611239a3b9accb478c9e48d1c7c3 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Fri, 25 Feb 2005 19:36:58 +0000 Subject: [PATCH] remove unused bShowUnderlines --- stepmania/Themes/default/metrics.ini | 3 ++- stepmania/src/ScreenOptions.cpp | 6 +----- stepmania/src/ScreenOptions.h | 4 +--- stepmania/src/ScreenOptionsMaster.cpp | 5 +---- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 4def896003..f438961b2a 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -3532,7 +3532,7 @@ PrevScreen=@ScreenTitleBranch() # exit the screen when in regular mode is "exit". LineNames=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 -OptionMenuFlags=together;forceallplayers;smnavigation;hideunderlines +OptionMenuFlags=together;forceallplayers;smnavigation # This NextScreen is only used for the "exit" choice. Line1=list,Appearance Options Line2=list,Background Options @@ -3550,6 +3550,7 @@ Line13=list,Other Options Line14=list,Network Options Line15=list,Reload Songs/Courses Line16=list,Test Input +ShowUnderlines=0 [ScreenOptionsTestMenu] Fallback=ScreenOptionsSubmenu diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index a5f104266d..81b09d0fb0 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -122,8 +122,6 @@ void ScreenOptions::Init() m_bGotAtLeastOneStartPressed[p] = false; } - m_bShowUnderlines = true; - m_framePage.RunCommands( FRAME_ON_COMMAND ); } @@ -132,7 +130,7 @@ void ScreenOptions::LoadOptionIcon( PlayerNumber pn, int iRow, CString sText ) m_Rows[iRow]->LoadOptionIcon( pn, sText ); } -void ScreenOptions::InitMenu( InputMode im, const vector &vDefs, const vector &vHands, bool bShowUnderlines ) +void ScreenOptions::InitMenu( InputMode im, const vector &vDefs, const vector &vHands ) { LOG->Trace( "ScreenOptions::Set()" ); @@ -140,8 +138,6 @@ void ScreenOptions::InitMenu( InputMode im, const vector &v m_InputMode = im; - m_bShowUnderlines = bShowUnderlines; - for( unsigned r=0; r &vDefs, const vector &vHands, bool bShowUnderlines = true ); + void InitMenu( InputMode im, const vector &vDefs, const vector &vHands ); virtual ~ScreenOptions(); virtual void Update( float fDeltaTime ); virtual void DrawPrimitives(); @@ -103,8 +103,6 @@ protected: // show if the current selections will disqualify a high score AutoActor m_sprDisqualify[NUM_PLAYERS]; - bool m_bShowUnderlines; - // TRICKY: People hold Start to get to PlayerOptions, then // the repeat events cause them to zip to the bottom. So, ignore // Start repeat events until we've seen one first pressed event. diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp index 16873daa24..c568c3fcec 100644 --- a/stepmania/src/ScreenOptionsMaster.cpp +++ b/stepmania/src/ScreenOptionsMaster.cpp @@ -45,7 +45,6 @@ void ScreenOptionsMaster::Init() split( OPTION_MENU_FLAGS, ";", Flags, true ); InputMode im = INPUTMODE_INDIVIDUAL; bool Explanations = false; - bool bShowUnderlines = true; for( unsigned i = 0; i < Flags.size(); ++i ) { @@ -66,8 +65,6 @@ void ScreenOptionsMaster::Init() SetNavigation( NAV_THREE_KEY_MENU ); else if( sFlag == "toggle" || sFlag == "firstchoicegoesdown" ) SetNavigation( PREFSMAN->m_bArcadeOptionsNavigation? NAV_TOGGLE_THREE_KEY:NAV_TOGGLE_FIVE_KEY ); - else if( sFlag == "hideunderlines" ) - bShowUnderlines = false; else RageException::Throw( "Unknown flag \"%s\"", sFlag.c_str() ); } @@ -95,7 +92,7 @@ void ScreenOptionsMaster::Init() ASSERT( OptionRowHandlers.size() == asLineNames.size() ); - InitMenu( im, m_OptionRowAlloc, OptionRowHandlers, bShowUnderlines ); + InitMenu( im, m_OptionRowAlloc, OptionRowHandlers ); } ScreenOptionsMaster::~ScreenOptionsMaster()