From fa949c78e478727ed33ae6b80a33dec4576f3614 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Sun, 8 Apr 2007 23:19:49 +0000 Subject: [PATCH] Don't play ready/go/failed/toasty/next song twice. I believe that since GenericTweenOn() returns true, BeginScreen() will run On on the entire screen. --- stepmania/src/ScreenGameplay.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index de9a680ddd..718a75408e 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -453,7 +453,6 @@ void ScreenGameplay::Init() if( !GAMESTATE->m_bDemonstrationOrJukebox ) // only load if we're going to use it { m_Toasty.Load( THEME->GetPathB(m_sName,"toasty") ); - m_Toasty.PlayCommand("On"); this->AddChild( &m_Toasty ); } @@ -486,12 +485,10 @@ void ScreenGameplay::Init() m_NextSong.Load( THEME->GetPathB(m_sName,"next course song") ); m_NextSong.SetDrawOrder( DRAW_ORDER_TRANSITIONS-1 ); - m_NextSong.PlayCommand("On"); this->AddChild( &m_NextSong ); m_SongFinished.SetDrawOrder( DRAW_ORDER_TRANSITIONS-1 ); m_SongFinished.Load( THEME->GetPathB(m_sName,"song finished") ); - m_SongFinished.PlayCommand("On"); this->AddChild( &m_SongFinished ); @@ -689,16 +686,13 @@ void ScreenGameplay::Init() if( !GAMESTATE->m_bDemonstrationOrJukebox ) // only load if we're going to use it { m_Ready.Load( THEME->GetPathB(m_sName,"ready") ); - m_Ready.PlayCommand("On"); this->AddChild( &m_Ready ); m_Go.Load( THEME->GetPathB(m_sName,"go") ); - m_Go.PlayCommand("On"); this->AddChild( &m_Go ); m_Failed.Load( THEME->GetPathB(m_sName,"failed") ); m_Failed.SetDrawOrder( DRAW_ORDER_TRANSITIONS-1 ); // on top of everything else - m_Failed.PlayCommand("On"); this->AddChild( &m_Failed ); m_textDebug.LoadFromFont( THEME->GetPathF("Common","normal") );