remove unused bShowUnderlines

This commit is contained in:
Chris Danford
2005-02-25 19:36:58 +00:00
parent fa18a0dbe2
commit 2f7e332d6b
4 changed files with 5 additions and 13 deletions
+2 -1
View File
@@ -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
+1 -5
View File
@@ -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<OptionRowDefinition> &vDefs, const vector<OptionRowHandler*> &vHands, bool bShowUnderlines )
void ScreenOptions::InitMenu( InputMode im, const vector<OptionRowDefinition> &vDefs, const vector<OptionRowHandler*> &vHands )
{
LOG->Trace( "ScreenOptions::Set()" );
@@ -140,8 +138,6 @@ void ScreenOptions::InitMenu( InputMode im, const vector<OptionRowDefinition> &v
m_InputMode = im;
m_bShowUnderlines = bShowUnderlines;
for( unsigned r=0; r<vDefs.size(); r++ ) // foreach row
{
m_Rows.push_back( new OptionRow() );
+1 -3
View File
@@ -24,7 +24,7 @@ class ScreenOptions : public ScreenWithMenuElements
public:
ScreenOptions( CString sClassName );
virtual void Init();
void InitMenu( InputMode im, const vector<OptionRowDefinition> &vDefs, const vector<OptionRowHandler*> &vHands, bool bShowUnderlines = true );
void InitMenu( InputMode im, const vector<OptionRowDefinition> &vDefs, const vector<OptionRowHandler*> &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.
+1 -4
View File
@@ -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()