simplify/optimize
This commit is contained in:
@@ -583,45 +583,7 @@ bool Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail )
|
|||||||
}
|
}
|
||||||
|
|
||||||
vector<Steps*> vpMatchingSteps;
|
vector<Steps*> vpMatchingSteps;
|
||||||
(*song)->GetSteps( vpMatchingSteps, st );
|
(*song)->GetSteps( vpMatchingSteps, st, e->baseDifficulty, e->iLowMeter, e->iHighMeter );
|
||||||
|
|
||||||
FOREACH( Steps*, vpMatchingSteps, steps )
|
|
||||||
{
|
|
||||||
if( e->baseDifficulty != DIFFICULTY_INVALID )
|
|
||||||
{
|
|
||||||
Difficulty dc = e->baseDifficulty;
|
|
||||||
if( (*steps)->GetDifficulty() != dc )
|
|
||||||
{
|
|
||||||
vector<Steps*>::iterator eraseme = steps;
|
|
||||||
steps--;
|
|
||||||
vpMatchingSteps.erase( eraseme );
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if( e->iLowMeter != -1 )
|
|
||||||
{
|
|
||||||
if( (*steps)->GetMeter() < e->iLowMeter )
|
|
||||||
{
|
|
||||||
vector<Steps*>::iterator eraseme = steps;
|
|
||||||
steps--;
|
|
||||||
vpMatchingSteps.erase( eraseme );
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if( e->iHighMeter != -1 )
|
|
||||||
{
|
|
||||||
if( (*steps)->GetMeter() > e->iHighMeter )
|
|
||||||
{
|
|
||||||
vector<Steps*>::iterator eraseme = steps;
|
|
||||||
steps--;
|
|
||||||
vpMatchingSteps.erase( eraseme );
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if( vpMatchingSteps.empty() )
|
if( vpMatchingSteps.empty() )
|
||||||
{
|
{
|
||||||
vector<Song*>::iterator eraseme = song;
|
vector<Song*>::iterator eraseme = song;
|
||||||
|
|||||||
Reference in New Issue
Block a user