diff --git a/stepmania/src/ScreenMiniMenu.cpp b/stepmania/src/ScreenMiniMenu.cpp index 0a697a1fb1..c38583522f 100644 --- a/stepmania/src/ScreenMiniMenu.cpp +++ b/stepmania/src/ScreenMiniMenu.cpp @@ -34,12 +34,6 @@ void ScreenMiniMenu::Init( const MenuDef* pDef, ScreenMessage SM_SendOnOK, Scree { ScreenOptions::Init(); - m_Background.Load( THEME->GetPathB(m_sName,"background") ); - m_Background->SetDrawOrder( DRAW_ORDER_BEFORE_EVERYTHING ); - this->AddChild( m_Background ); - - this->SortByDrawOrder(); - m_SMSendOnOK = SM_SendOnOK; m_SMSendOnCancel = SM_SendOnCancel; m_vMenuRows = pDef->rows; @@ -83,13 +77,6 @@ void ScreenMiniMenu::Init( const MenuDef* pDef, ScreenMessage SM_SendOnOK, Scree ScreenOptions::InitMenu( vDefs, vHands ); } -void ScreenMiniMenu::BeginScreen() -{ - ScreenOptions::BeginScreen(); - - m_Background->PlayCommand( "On" ); -} - void ScreenMiniMenu::OnChange( PlayerNumber pn ) { ScreenOptions::OnChange( pn ); diff --git a/stepmania/src/ScreenMiniMenu.h b/stepmania/src/ScreenMiniMenu.h index 82217c6559..637c0b3d9f 100644 --- a/stepmania/src/ScreenMiniMenu.h +++ b/stepmania/src/ScreenMiniMenu.h @@ -80,7 +80,6 @@ public: ScreenMiniMenu( CString sScreenClass ); void Init( const MenuDef* pDef, ScreenMessage SM_SendOnOK, ScreenMessage SM_SendOnCancel ); - virtual void BeginScreen(); void HandleScreenMessage( const ScreenMessage SM ); protected: @@ -88,10 +87,6 @@ protected: virtual void ImportOptions( int iRow, const vector &vpns ); virtual void ExportOptions( int iRow, const vector &vpns ); - // Screens that get pushed on top of other screens don't - // use the ScreenManager's shared background, so they must draw their own. - AutoActor m_Background; - ScreenMessage m_SMSendOnOK; ScreenMessage m_SMSendOnCancel;