cleanup (trying to do only what's needed in ScreenOptions::InitMenu, to make

things saner)
This commit is contained in:
Glenn Maynard
2005-07-15 03:33:53 +00:00
parent d7d070077e
commit ddedfe25bc
+15 -15
View File
@@ -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<OptionRowDefinition> &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