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

Cannot use FOREACH here since --song is not valid for the first element.

Browse Source
This commit is contained in:
Steve Checkoway
2005-10-31 00:32:30 +00:00
parent 74b107f8bb
commit b6df02af4c
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Course.cpp
+4 -11
View File
@@ -517,26 +517,23 @@ bool Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail )
SONGMAN->GetSongs(vpAllPossibleSongs, 1);
// remove locked and tutorial songs from the list
FOREACH( Song*, vpAllPossibleSongs, song )
for( vector<Song *>::iterator song = vpAllPossibleSongs.begin(); song != vpAllPossibleSongs.end(); )
{
// Ignore locked songs when choosing randomly
// TODO: Move Course initialization after UNLOCKMAN is created
if( UNLOCKMAN && UNLOCKMAN->SongIsLocked(*song) )
{
vector<Song*>::iterator eraseme = song;
song--;
vpAllPossibleSongs.erase( eraseme );
song = vpAllPossibleSongs.erase( song );
continue;
}
// Ignore boring tutorial songs
if( (*song)->IsTutorial() )
{
vector<Song*>::iterator eraseme = song;
song--;
vpAllPossibleSongs.erase( eraseme );
song = vpAllPossibleSongs.erase( song );
continue;
}
++song;
}
// Resolve each entry to a Song and Steps.
@@ -558,13 +555,9 @@ bool Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail )
// Choose an exact song, if we have matching steps and all
e->pSong->GetSteps( vpPossibleSteps, st, e->baseDifficulty, e->iLowMeter, e->iHighMeter );
if( !vpPossibleSteps.empty() )
{
pResolvedSong = e->pSong;
}
else
{
continue;
}
}
else
{