From 079e0f5397d54c6123a47c01c8adc615516819f6 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 24 Apr 2007 01:41:34 +0000 Subject: [PATCH] partial revert (not sure if this is worth maintaining, but it didn't need to be removed for the last commit) --- stepmania/src/GameState.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 1b9e4a8182..870b716cfd 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -910,7 +910,11 @@ bool GameState::IsFinalStage() const if( IsCourseMode() ) return true; - return GetLargestCurrentStageIndexForAnyHumanPlayer() == PREFSMAN->m_iSongsPerPlay - 1; + /* This changes dynamically on ScreenSelectMusic as the wheel turns. */ + int iPredictedStageForCurSong = GetNumStagesForCurrentSongAndStepsOrCourse(); + if( iPredictedStageForCurSong == -1 ) + iPredictedStageForCurSong = 1; + return GetLargestCurrentStageIndexForAnyHumanPlayer() + iPredictedStageForCurSong == PREFSMAN->m_iSongsPerPlay; } bool GameState::IsAnExtraStage() const