cleanup (trying to do only what's needed in ScreenOptions::InitMenu, to make
things saner)
This commit is contained in:
@@ -150,6 +150,21 @@ void ScreenOptions::Init()
|
|||||||
m_framePage.AddChild( &m_textExplanation[p] );
|
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 )
|
if( SHOW_SCROLL_BAR )
|
||||||
{
|
{
|
||||||
m_ScrollBar.SetName( "ScrollBar" );
|
m_ScrollBar.SetName( "ScrollBar" );
|
||||||
@@ -231,21 +246,6 @@ void ScreenOptions::InitMenu( const vector<OptionRowDefinition> &vDefs, const ve
|
|||||||
m_framePage.AddChild( &row );
|
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();
|
m_framePage.SortByDrawOrder();
|
||||||
|
|
||||||
// poke once at all the explanation metrics so that we catch missing ones early
|
// poke once at all the explanation metrics so that we catch missing ones early
|
||||||
|
|||||||
Reference in New Issue
Block a user