diff --git a/stepmania/src/ScreenEz2SelectPlayer.cpp b/stepmania/src/ScreenEz2SelectPlayer.cpp index fd72136783..0136850798 100644 --- a/stepmania/src/ScreenEz2SelectPlayer.cpp +++ b/stepmania/src/ScreenEz2SelectPlayer.cpp @@ -54,9 +54,23 @@ ScreenEz2SelectPlayer::ScreenEz2SelectPlayer() LOG->Trace( "ScreenEz2SelectPlayer::ScreenEz2SelectPlayer()" ); + m_Menu.Load( + THEME->GetPathTo("Graphics","select player background"), + THEME->GetPathTo("Graphics","select player top edge"), + HELP_TEXT, false, true, TIMER_SECONDS + ); + this->AddChild( &m_Menu ); + + m_Background.LoadFromAniDir( THEME->GetPathTo("BGAnimations","ez2 select player") ); + this->AddChild( &m_Background ); // animated background =) + + m_logo.Load( THEME->GetPathTo("Graphics","select player logo")); + m_logo.SetXY( CENTER_X, CENTER_Y); + this->AddChild( &m_logo ); + for( p=0; pGetPathTo("Graphics","select player controller") ); + m_sprControllers[p].Load( THEME->GetPathTo("Graphics",ssprintf("select player controller p%d", p+1)) ); // two of these for pump support. m_sprControllers[p].SetXY( CONTROLLER_X(p), CONTROLLER_Y(p) ); this->AddChild( &m_sprControllers[p] ); @@ -66,13 +80,6 @@ ScreenEz2SelectPlayer::ScreenEz2SelectPlayer() this->AddChild( &m_sprCursors[p] ); } - m_Menu.Load( - THEME->GetPathTo("Graphics","select player background"), - THEME->GetPathTo("Graphics","select player top edge"), - HELP_TEXT, false, true, TIMER_SECONDS - ); - this->AddChild( &m_Menu ); - m_soundSelect.Load( THEME->GetPathTo("Sounds","menu start") ); SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select player intro") ); diff --git a/stepmania/src/ScreenEz2SelectPlayer.h b/stepmania/src/ScreenEz2SelectPlayer.h index 720eb74cee..745ebcec30 100644 --- a/stepmania/src/ScreenEz2SelectPlayer.h +++ b/stepmania/src/ScreenEz2SelectPlayer.h @@ -35,8 +35,10 @@ private: Sprite m_sprCursors[NUM_PLAYERS]; Sprite m_sprControllers[NUM_PLAYERS]; + Sprite m_logo; MenuElements m_Menu; RageSoundSample m_soundSelect; + BackgroundAnimation m_Background; };