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

Minor fixes

Browse Source
This commit is contained in:
Jonathan Albert
2020-06-07 20:07:49 -04:00
committed by quietly turning
parent 1e6b0d7f35
commit f49229809d
1 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Course.cpp
+6 -20
View File
@@ -454,9 +454,9 @@ bool Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail )
} }
else else
{ {
vector<SongAndSteps> vSongAndSteps;
for (auto e = entries.begin(); e != entries.end(); ++e) for (auto e = entries.begin(); e != entries.end(); ++e)
{ {
vector<SongAndSteps> vSongAndSteps;
SongAndSteps resolved; // fill this in SongAndSteps resolved; // fill this in
SongCriteria soc = e->songCriteria; SongCriteria soc = e->songCriteria;
@@ -480,6 +480,7 @@ bool Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail )
if( pSong ) if( pSong )
{ {
vSongAndSteps.clear();
StepsUtil::GetAllMatching( pSong, stc, vSongAndSteps ); StepsUtil::GetAllMatching( pSong, stc, vSongAndSteps );
} }
else if( vSongAndSteps.empty() || !( bSameSongCriteria && bSameStepsCriteria ) ) else if( vSongAndSteps.empty() || !( bSameSongCriteria && bSameStepsCriteria ) )
@@ -704,27 +705,17 @@ void Course::GetTrailUnsortedEndless( const vector<CourseEntry> &entries, Trail
// Make a backup of the steplist so we can revert if we overfilter // Make a backup of the steplist so we can revert if we overfilter
std::vector<SongAndSteps> revertList = vSongAndSteps; std::vector<SongAndSteps> revertList = vSongAndSteps;
// Filter candidate list via blacklist // Filter candidate list via blacklist
vSongAndSteps.erase(std::remove_if( RemoveIf(vSongAndSteps, [&](const SongAndSteps& ss) {
vSongAndSteps.begin(),
vSongAndSteps.end(),
[&](const SongAndSteps& ss) {
return std::find(alreadySelected.begin(), alreadySelected.end(), ss.pSong) != alreadySelected.end(); return std::find(alreadySelected.begin(), alreadySelected.end(), ss.pSong) != alreadySelected.end();
}), });
vSongAndSteps.end());
// If every candidate is in the blacklist, pick random song that wasn't played last // If every candidate is in the blacklist, pick random song that wasn't played last
// (Repeat songs may still occur if song after this is fixed; this algorithm doesn't look ahead) // (Repeat songs may still occur if song after this is fixed; this algorithm doesn't look ahead)
if (vSongAndSteps.empty()) if (vSongAndSteps.empty())
{ {
vSongAndSteps = revertList; vSongAndSteps = revertList;
vSongAndSteps.erase(std::remove_if( RemoveIf(vSongAndSteps, SongIsEqual(lastSongSelected));
vSongAndSteps.begin(),
vSongAndSteps.end(),
[&](const SongAndSteps& ss) {
return ss.pSong == lastSongSelected;
}),
vSongAndSteps.end());
// If the song that was played last was the only candidate, forget it // If the song that was played last was the only candidate, give up pick randomly
if (vSongAndSteps.empty()) if (vSongAndSteps.empty())
{ {
vSongAndSteps = revertList; vSongAndSteps = revertList;
@@ -859,11 +850,6 @@ void Course::GetTrailUnsortedEndless( const vector<CourseEntry> &entries, Trail
} }
trail.m_vEntries.push_back( te ); trail.m_vEntries.push_back( te );
//if( trail.m_vEntries.size() > 0 && te.dc != cd )
//{
// trail.m_vEntries.reserve( trail.m_vEntries.size() - 1 );
// trail.m_vEntries.resize( trail.m_vEntries.size() - 1 );
//}
// LOG->Trace( "Chose: %s, %d", te.pSong->GetSongDir().c_str(), te.pSteps->GetMeter() ); // LOG->Trace( "Chose: %s, %d", te.pSong->GetSongDir().c_str(), te.pSteps->GetMeter() );
if( IsAnEdit() && MAX_SONGS_IN_EDIT_COURSE > 0 && if( IsAnEdit() && MAX_SONGS_IN_EDIT_COURSE > 0 &&