From ddedfe25bceec8d3cd74233e529e5b6cac524b4b Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 15 Jul 2005 03:33:53 +0000 Subject: [PATCH] cleanup (trying to do only what's needed in ScreenOptions::InitMenu, to make things saner) --- stepmania/src/ScreenOptions.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index 3efb391ffa..565d0976c0 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -150,6 +150,21 @@ void ScreenOptions::Init() m_framePage.AddChild( &m_textExplanation[p] ); } + switch( m_InputMode ) + { + case INPUTMODE_INDIVIDUAL: + { + FOREACH_PlayerNumber( p ) + m_textExplanation[p].SetXY( EXPLANATION_X.GetValue(p), EXPLANATION_Y.GetValue(p) ); + } + break; + case INPUTMODE_SHARE_CURSOR: + m_textExplanation[0].SetXY( EXPLANATION_TOGETHER_X, EXPLANATION_TOGETHER_Y ); + break; + default: + ASSERT(0); + } + if( SHOW_SCROLL_BAR ) { m_ScrollBar.SetName( "ScrollBar" ); @@ -231,21 +246,6 @@ void ScreenOptions::InitMenu( const vector &vDefs, const ve m_framePage.AddChild( &row ); } - switch( m_InputMode ) - { - case INPUTMODE_INDIVIDUAL: - { - FOREACH_PlayerNumber( p ) - m_textExplanation[p].SetXY( EXPLANATION_X.GetValue(p), EXPLANATION_Y.GetValue(p) ); - } - break; - case INPUTMODE_SHARE_CURSOR: - m_textExplanation[0].SetXY( EXPLANATION_TOGETHER_X, EXPLANATION_TOGETHER_Y ); - break; - default: - ASSERT(0); - } - m_framePage.SortByDrawOrder(); // poke once at all the explanation metrics so that we catch missing ones early