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

don't bother checking for a group match when we already have an exact song match

Browse Source
This commit is contained in:
Chris Danford
2005-10-31 00:27:48 +00:00
parent 7a3887c1c1
commit 74b107f8bb
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Course.cpp
+2 -3
View File
@@ -557,7 +557,7 @@ bool Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail )
{ {
// Choose an exact song, if we have matching steps and all // Choose an exact song, if we have matching steps and all
e->pSong->GetSteps( vpPossibleSteps, st, e->baseDifficulty, e->iLowMeter, e->iHighMeter ); e->pSong->GetSteps( vpPossibleSteps, st, e->baseDifficulty, e->iLowMeter, e->iHighMeter );
if( ( !e->sSongGroup.empty() && (*song)->m_sGroupName == e->sSongGroup ) && !vpPossibleSteps.empty() ) if( !vpPossibleSteps.empty() )
{ {
pResolvedSong = e->pSong; pResolvedSong = e->pSong;
} }
@@ -623,8 +623,7 @@ bool Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail )
} }
ASSERT( !vpPossibleSteps.empty() ); // if no steps are playable, this shouldn't be a possible song ASSERT( !vpPossibleSteps.empty() ); // if no steps are playable, this shouldn't be a possible song
if( vpPossibleSteps.size() > 1 ) // no reason to randomize if there's only one set of possible steps random_shuffle( vpPossibleSteps.begin(), vpPossibleSteps.end(), rnd );
random_shuffle( vpPossibleSteps.begin(), vpPossibleSteps.end(), rnd );
pResolvedSteps = vpPossibleSteps[0]; pResolvedSteps = vpPossibleSteps[0];
if( pResolvedSong == NULL || pResolvedSteps == NULL ) if( pResolvedSong == NULL || pResolvedSteps == NULL )