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

simplify

Browse Source 
ChangePreferredCourseDifficulty: only choose among difficulties available in the course
This commit is contained in:
Glenn Maynard
2004-06-03 21:33:37 +00:00
parent 6696e26acf
commit 088cc44d93
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameState.cpp
+10 -4
View File
@@ -1491,7 +1491,6 @@ void GameState::GetRankingFeats( PlayerNumber pn, vector<RankingFeat> &asFeatsOu
case PLAY_MODE_ENDLESS: case PLAY_MODE_ENDLESS:
{ {
CHECKPOINT; CHECKPOINT;
StepsType st = GetCurrentStyleDef()->m_StepsType;
Course* pCourse = m_pCurCourse; Course* pCourse = m_pCurCourse;
ASSERT( pCourse ); ASSERT( pCourse );
Trail *pTrail = m_pCurTrail[pn]; Trail *pTrail = m_pCurTrail[pn];
@@ -1527,7 +1526,6 @@ void GameState::GetRankingFeats( PlayerNumber pn, vector<RankingFeat> &asFeatsOu
// Find Personal Records // Find Personal Records
if( PROFILEMAN->IsUsingProfile( pn ) ) if( PROFILEMAN->IsUsingProfile( pn ) )
{ {
Trail *pTrail = pCourse->GetTrail( st, cd );
HighScoreList &hsl = pProf->GetCourseHighScoreList( pCourse, pTrail ); HighScoreList &hsl = pProf->GetCourseHighScoreList( pCourse, pTrail );
for( unsigned i=0; i<hsl.vHighScores.size(); i++ ) for( unsigned i=0; i<hsl.vHighScores.size(); i++ )
{ {
@@ -1728,15 +1726,23 @@ bool GameState::ChangePreferredCourseDifficulty( PlayerNumber pn, CourseDifficul
bool GameState::ChangePreferredCourseDifficulty( PlayerNumber pn, int dir ) bool GameState::ChangePreferredCourseDifficulty( PlayerNumber pn, int dir )
{ {
/* If we have a course selected, only choose among difficulties available in the course. */
const Course *pCourse = this->m_pCurCourse;
set<CourseDifficulty> asDiff; set<CourseDifficulty> asDiff;
GetCourseDifficultiesToShow( asDiff ); GetCourseDifficultiesToShow( asDiff );
CourseDifficulty cd = m_PreferredCourseDifficulty[pn]; CourseDifficulty cd = m_PreferredCourseDifficulty[pn];
do { while( 1 )
{
cd = (CourseDifficulty)(cd+dir); cd = (CourseDifficulty)(cd+dir);
if( cd < 0 || cd >= NUM_COURSE_DIFFICULTIES ) if( cd < 0 || cd >= NUM_COURSE_DIFFICULTIES )
return false; return false;
} while( asDiff.find(cd) == asDiff.end() ); if( asDiff.find(cd) == asDiff.end() )
continue; /* not available */
if( !pCourse || pCourse->HasCourseDifficulty( GAMESTATE->GetCurrentStyleDef()->m_StepsType, cd ) )
break;
}
return ChangePreferredCourseDifficulty( pn, cd ); return ChangePreferredCourseDifficulty( pn, cd );
} }