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

fix queue size assert when demoing courses

Browse Source
This commit is contained in:
Chris Danford
2005-05-20 21:08:08 +00:00
parent 9048ffa9de
commit 8b53c75e48
1 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenJukebox.cpp
+29 -9
View File
@@ -288,18 +288,38 @@ void ScreenJukebox::InitSongQueues()
{
ScreenGameplay::InitSongQueues();
// Pare down to just the song in the course that we want.
int iIndexToKeep = -1;
for( int i=0; i<m_apSongsQueue.size(); i++ )
{
if( m_apSongsQueue[i] == GAMESTATE->m_pCurSong )
{
iIndexToKeep = i;
break;
}
}
ASSERT( iIndexToKeep != -1 );
for( int i=(m_apSongsQueue.size())-1; i>=0; i-- )
{
if( i != iIndexToKeep )
{
m_apSongsQueue.erase( m_apSongsQueue.begin()+i );
FOREACH_EnabledPlayer(p)
{
m_vpStepsQueue[p].erase( m_vpStepsQueue[p].begin()+i );
m_asModifiersQueue[p].erase( m_asModifiersQueue[p].begin()+i );
}
}
}
ASSERT_M( m_apSongsQueue.size() == 1, ssprintf("%i", (int) m_apSongsQueue.size()) );
FOREACH_PlayerNumber(p)
ASSERT_M( m_asModifiersQueue[p].size() == 1, ssprintf("%i", (int) m_asModifiersQueue[p].size()) );
if( m_pCourseEntry )
{
AttackArray aAttacks = m_pCourseEntry->attacks;
if( !m_pCourseEntry->modifiers.empty() )
aAttacks.push_back( Attack::FromGlobalCourseModifier( m_pCourseEntry->modifiers ) );
FOREACH_PlayerNumber(pn)
m_asModifiersQueue[pn][0] = aAttacks;
ASSERT_M( m_vpStepsQueue[p].size() == 1, ssprintf("%i", (int) m_vpStepsQueue[p].size()) );
ASSERT_M( m_asModifiersQueue[p].size() == 1, ssprintf("%i", (int) m_asModifiersQueue[p].size()) );
}
}