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

Simplify.

Browse Source
This commit is contained in:
Steve Checkoway
2006-07-30 00:09:16 +00:00
parent 646915e17a
commit 879de00412
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Course.cpp
+12 -7
View File
@@ -400,6 +400,16 @@ static void CourseSortSongs( SongSort sort, vector<Song*> &vpPossibleSongs, Rand
}
}
namespace
{
struct SongIsEqual
{
const Song *m_pSong;
SongIsEqual( const Song *pSong ) : m_pSong(pSong) { }
bool operator()( const SongAndSteps &sas ) const { return sas.pSong == m_pSong; }
};
}
bool Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail ) const
{
trail.Init();
@@ -455,7 +465,6 @@ bool Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail )
}
soc.m_Tutorial = SongCriteria::Tutorial_No;
soc.m_Locked = SongCriteria::Locked_Unlocked;
soc.m_Locked = SongCriteria::Locked_Unlocked;
if( !soc.m_bUseSongAllowedList )
soc.m_iStagesForSong = 1;
@@ -471,7 +480,7 @@ bool Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail )
// one song in vpPossibleSongs.
if( trail.m_vEntries.size() > 0 && vSongAndSteps.size() > 1 )
{
const TrailEntry &teLast = trail.m_vEntries[trail.m_vEntries.size()-1];
const TrailEntry &teLast = trail.m_vEntries.back();
bool bExistsDifferentSongThanLast = false;
FOREACH_CONST( SongAndSteps, vSongAndSteps, sas )
{
@@ -482,11 +491,7 @@ bool Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail )
}
}
for( int i=vSongAndSteps.size()-1; i>=0; i-- )
{
if( vSongAndSteps[i].pSong == teLast.pSong )
vSongAndSteps.erase( vSongAndSteps.begin()+i );
}
RemoveIf( vSongAndSteps, SongIsEqual(teLast.pSong) );
}
// if there are no songs to choose from, abort this CourseEntry