From 99504e2522053569832e31f79d573556ef23bcd8 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 29 Jul 2005 05:08:57 +0000 Subject: [PATCH] do this stuff in BeginScreen, so we set up music, etc. again if we reuse a screen --- stepmania/src/ScreenWithMenuElements.cpp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/stepmania/src/ScreenWithMenuElements.cpp b/stepmania/src/ScreenWithMenuElements.cpp index a58256a1f3..e03fba6787 100644 --- a/stepmania/src/ScreenWithMenuElements.cpp +++ b/stepmania/src/ScreenWithMenuElements.cpp @@ -150,6 +150,12 @@ void ScreenWithMenuElements::BeginScreen() m_In.StartTransitioning( SM_DoneFadingIn ); Screen::BeginScreen(); + + SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo(m_sName+" intro") ); + StartPlayingMusic(); + + /* Evaluate FirstUpdateCommand. */ + this->RunCommands( FIRST_UPDATE_COMMAND ); } void ScreenWithMenuElements::TweenOnScreen() @@ -212,18 +218,6 @@ void ScreenWithMenuElements::StartPlayingMusic() void ScreenWithMenuElements::Update( float fDeltaTime ) { - if( m_bFirstUpdate ) - { - /* Don't play sounds during the ctor, since derived classes havn't loaded yet. - * Play sounds after so loading so we don't thrash while loading files. */ - SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo(m_sName+" intro") ); - - StartPlayingMusic(); - - /* Evaluate FirstUpdateCommand. */ - this->RunCommands( FIRST_UPDATE_COMMAND ); - } - Screen::Update( fDeltaTime ); }