remove frame element. Use ScreenWithMenuElements::Overlay instead

This commit is contained in:
Chris Danford
2005-01-08 12:37:21 +00:00
parent 83d89decb2
commit 58e58f4770
2 changed files with 4 additions and 11 deletions
+1 -7
View File
@@ -96,7 +96,7 @@ const float ITEM_X[NUM_PLAYERS] = { 260, 420 };
* in player options menus, but it should in the options menu. * in player options menus, but it should in the options menu.
*/ */
//REGISTER_SCREEN_CLASS( ScreenOptions ); //REGISTER_SCREEN_CLASS( ScreenOptions ); // can't be instantiated
ScreenOptions::ScreenOptions( CString sClassName ) : ScreenWithMenuElements(sClassName) ScreenOptions::ScreenOptions( CString sClassName ) : ScreenWithMenuElements(sClassName)
{ {
LOG->Trace( "ScreenOptions::ScreenOptions()" ); LOG->Trace( "ScreenOptions::ScreenOptions()" );
@@ -434,18 +434,12 @@ void ScreenOptions::InitMenu( InputMode im, OptionRowData OptionRows[], int iNum
m_framePage.AddChild( m_sprDisqualify[p] ); m_framePage.AddChild( m_sprDisqualify[p] );
} }
m_sprFrame.Load( THEME->GetPathToG( "ScreenOptions frame") );
m_sprFrame->SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y );
m_framePage.AddChild( m_sprFrame );
// 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
{
for( int r=0; r<(int)m_Rows.size(); r++ ) // foreach row for( int r=0; r<(int)m_Rows.size(); r++ ) // foreach row
{ {
GetExplanationText( r ); GetExplanationText( r );
GetExplanationTitle( r ); GetExplanationTitle( r );
} }
}
CHECKPOINT; CHECKPOINT;
-1
View File
@@ -149,7 +149,6 @@ protected:
ActorFrame m_framePage; ActorFrame m_framePage;
AutoActor m_sprPage; AutoActor m_sprPage;
AutoActor m_sprFrame;
OptionsCursor m_Highlight[NUM_PLAYERS]; OptionsCursor m_Highlight[NUM_PLAYERS];
Sprite m_sprLineHighlight[NUM_PLAYERS]; Sprite m_sprLineHighlight[NUM_PLAYERS];