diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp index baa0443665..dd42024203 100644 --- a/stepmania/src/ScreenSelect.cpp +++ b/stepmania/src/ScreenSelect.cpp @@ -53,12 +53,6 @@ ScreenSelect::ScreenSelect( CString sClassName ) : mc.m_sName = sChoiceName; mc.Load( c, CHOICE(sChoiceName) ); m_aGameCommands.push_back( mc ); - - CString sBGAnimationDir = THEME->GetPath(BGAnimations, m_sName, mc.m_sName, true); // true="optional" - if( sBGAnimationDir == "" ) - sBGAnimationDir = THEME->GetPathToB(m_sName+" background"); - BGAnimation *pBGA = new BGAnimation; - m_vpBGAnimations.push_back( pBGA ); } } @@ -95,9 +89,6 @@ ScreenSelect::ScreenSelect( CString sClassName ) : ScreenSelect::~ScreenSelect() { LOG->Trace( "ScreenSelect::~ScreenSelect()" ); - for( unsigned i=0; im_MasterPlayerNumber is set to PLAYER_INVALID when going Back to - // the title screen and this screen is updated after. TODO: find out why - if( GAMESTATE->m_MasterPlayerNumber != PLAYER_INVALID ) - { - int iSelection = this->GetSelectionIndex(GAMESTATE->m_MasterPlayerNumber); - m_vpBGAnimations[iSelection]->Update( fDelta ); - } } void ScreenSelect::DrawPrimitives() { - // GAMESTATE->m_MasterPlayerNumber is set to PLAYER_INVALID when going Back to - // the title screen and this screen is updated after. TODO: find out why - if( GAMESTATE->m_MasterPlayerNumber != PLAYER_INVALID ) - { - int iSelection = this->GetSelectionIndex(GAMESTATE->m_MasterPlayerNumber); - m_vpBGAnimations[iSelection]->Draw(); - } Screen::DrawPrimitives(); } diff --git a/stepmania/src/ScreenSelect.h b/stepmania/src/ScreenSelect.h index e8116ba2e8..316b799992 100644 --- a/stepmania/src/ScreenSelect.h +++ b/stepmania/src/ScreenSelect.h @@ -4,7 +4,6 @@ #define SCREEN_SELECT_H #include "ScreenWithMenuElements.h" -#include "BGAnimation.h" #include "GameCommand.h" #include "CodeDetector.h" #include "ThemeMetric.h" @@ -29,7 +28,6 @@ protected: virtual int GetSelectionIndex( PlayerNumber pn ) = 0; virtual void UpdateSelectableChoices() = 0; // derived screens must handle this - vector m_vpBGAnimations; vector m_aGameCommands; // derived classes should look here for what choices are available vector m_aCodes;