ScreenGameplay::InitSongQueues adds songs to m_apSongsQueue,

etc.  ScreenJukebox::InitSongQueues trims them.  Init
m_CurStageStats.m_vpPossibleSongs outside of InitSongQueues,
so it isn't initialized differently than the queues.
This commit is contained in:
Glenn Maynard
2007-05-31 01:14:23 +00:00
parent 9b8ef44337
commit 617712a1cf
+11 -14
View File
@@ -732,9 +732,20 @@ void ScreenGameplay::Init()
// fill in m_apSongsQueue, m_vpStepsQueue, m_asModifiersQueue
//
InitSongQueues();
// Fill StageStats
STATSMAN->m_CurStageStats.m_vpPossibleSongs = m_apSongsQueue;
FOREACH( PlayerInfo, m_vPlayerInfo, pi )
{
if( pi->GetPlayerStageStats() )
pi->GetPlayerStageStats()->m_vpPossibleSteps = pi->m_vpStepsQueue;
}
FOREACH_EnabledPlayerInfo( m_vPlayerInfo, pi )
{
ASSERT( !pi->m_vpStepsQueue.empty() );
if( pi->GetPlayerStageStats() )
pi->GetPlayerStageStats()->m_bJoined = true;
if( pi->m_pPrimaryScoreKeeper )
pi->m_pPrimaryScoreKeeper->Load( m_apSongsQueue, pi->m_vpStepsQueue, pi->m_asModifiersQueue );
if( pi->m_pSecondaryScoreKeeper )
@@ -821,20 +832,6 @@ void ScreenGameplay::InitSongQueues()
pi->m_asModifiersQueue.push_back( aa );
}
}
// Fill StageStats
STATSMAN->m_CurStageStats.m_vpPossibleSongs = m_apSongsQueue;
FOREACH( PlayerInfo, m_vPlayerInfo, pi )
{
if( pi->GetPlayerStageStats() )
pi->GetPlayerStageStats()->m_vpPossibleSteps = pi->m_vpStepsQueue;
}
FOREACH_EnabledPlayerInfo( m_vPlayerInfo, pi )
{
if( pi->GetPlayerStageStats() )
pi->GetPlayerStageStats()->m_bJoined = true;
}
}
ScreenGameplay::~ScreenGameplay()