simplify: m_bGameplayLeadIn is regular state, not music state; reset in Reset(),

not ResetMusicStatistics
This commit is contained in:
Glenn Maynard
2005-10-10 04:50:53 +00:00
parent 49b7d0bcbe
commit 1a3d247dbf
2 changed files with 5 additions and 6 deletions
+2 -3
View File
@@ -862,6 +862,8 @@ void ScreenGameplay::Init()
pi->m_pSecondaryScoreKeeper->Load( m_apSongsQueue, pi->m_vpStepsQueue, pi->m_asModifiersQueue );
}
GAMESTATE->m_bGameplayLeadIn.Set( true );
/* LoadNextSong first, since that positions some elements which need to be
* positioned before we TweenOnScreen. */
LoadNextSong();
@@ -1061,8 +1063,6 @@ void ScreenGameplay::LoadNextSong()
{
GAMESTATE->ResetMusicStatistics();
GAMESTATE->m_bGameplayLeadIn.Set( true );
FOREACH_EnabledPlayerInfoNotDummy( m_vPlayerInfo, pi )
{
pi->GetPlayerStageStats()->iSongsPlayed++;
@@ -2494,7 +2494,6 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
COMMAND( m_sprCourseSongNumber, "ChangeOut" );
LoadNextSong();
GAMESTATE->m_bGameplayLeadIn.Set( false );
m_NextSong.Reset();
m_NextSong.PlayCommand( "Finish" );