From e6a456e1c356b7b4a9b76c771962d9078d8ebd37 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Tue, 21 Feb 2006 01:36:49 +0000 Subject: [PATCH] Handle random entries. --- stepmania/src/Course.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp index 80a4da76ae..6d7711c715 100644 --- a/stepmania/src/Course.cpp +++ b/stepmania/src/Course.cpp @@ -525,16 +525,15 @@ bool Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail ) continue; CourseSortSongs( e->songSort, vpPossibleSongs, rnd ); - - if( e->iChooseIndex < int(vpPossibleSongs.size()) ) - { + + ASSERT( e->iChooseIndex >= -1 ); + if( e->iChooseIndex == -1 ) + pResolvedSong = vpPossibleSongs[RandomInt(0, vpPossibleSongs.size()-1)]; + else if( e->iChooseIndex < int(vpPossibleSongs.size()) ) pResolvedSong = vpPossibleSongs[e->iChooseIndex]; - pResolvedSong->GetSteps( vpPossibleSteps, st, e->baseDifficulty, e->iLowMeter, e->iHighMeter ); - } else - { continue; - } + pResolvedSong->GetSteps( vpPossibleSteps, st, e->baseDifficulty, e->iLowMeter, e->iHighMeter ); } ASSERT( !vpPossibleSteps.empty() ); // if no steps are playable, this shouldn't be a possible song