actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Steve Checkoway
2007-04-08 23:19:49 +00:00
parent 9f458bd62b
commit fa949c78e4
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
-6
View File
@@ -453,7 +453,6 @@ void ScreenGameplay::Init()
if( !GAMESTATE->m_bDemonstrationOrJukebox ) // only load if we're going to use it if( !GAMESTATE->m_bDemonstrationOrJukebox ) // only load if we're going to use it
{ {
m_Toasty.Load( THEME->GetPathB(m_sName,"toasty") ); m_Toasty.Load( THEME->GetPathB(m_sName,"toasty") );
m_Toasty.PlayCommand("On");
this->AddChild( &m_Toasty ); this->AddChild( &m_Toasty );
} }
@@ -486,12 +485,10 @@ void ScreenGameplay::Init()
m_NextSong.Load( THEME->GetPathB(m_sName,"next course song") ); m_NextSong.Load( THEME->GetPathB(m_sName,"next course song") );
m_NextSong.SetDrawOrder( DRAW_ORDER_TRANSITIONS-1 ); m_NextSong.SetDrawOrder( DRAW_ORDER_TRANSITIONS-1 );
m_NextSong.PlayCommand("On");
this->AddChild( &m_NextSong ); this->AddChild( &m_NextSong );
m_SongFinished.SetDrawOrder( DRAW_ORDER_TRANSITIONS-1 ); m_SongFinished.SetDrawOrder( DRAW_ORDER_TRANSITIONS-1 );
m_SongFinished.Load( THEME->GetPathB(m_sName,"song finished") ); m_SongFinished.Load( THEME->GetPathB(m_sName,"song finished") );
m_SongFinished.PlayCommand("On");
this->AddChild( &m_SongFinished ); this->AddChild( &m_SongFinished );
@@ -689,16 +686,13 @@ void ScreenGameplay::Init()
if( !GAMESTATE->m_bDemonstrationOrJukebox ) // only load if we're going to use it if( !GAMESTATE->m_bDemonstrationOrJukebox ) // only load if we're going to use it
{ {
m_Ready.Load( THEME->GetPathB(m_sName,"ready") ); m_Ready.Load( THEME->GetPathB(m_sName,"ready") );
m_Ready.PlayCommand("On");
this->AddChild( &m_Ready ); this->AddChild( &m_Ready );
m_Go.Load( THEME->GetPathB(m_sName,"go") ); m_Go.Load( THEME->GetPathB(m_sName,"go") );
m_Go.PlayCommand("On");
this->AddChild( &m_Go ); this->AddChild( &m_Go );
m_Failed.Load( THEME->GetPathB(m_sName,"failed") ); m_Failed.Load( THEME->GetPathB(m_sName,"failed") );
m_Failed.SetDrawOrder( DRAW_ORDER_TRANSITIONS-1 ); // on top of everything else m_Failed.SetDrawOrder( DRAW_ORDER_TRANSITIONS-1 ); // on top of everything else
m_Failed.PlayCommand("On");
this->AddChild( &m_Failed ); this->AddChild( &m_Failed );
m_textDebug.LoadFromFont( THEME->GetPathF("Common","normal") ); m_textDebug.LoadFromFont( THEME->GetPathF("Common","normal") );