From 1349a5136008a15cc5caab0d9278eff88e384b60 Mon Sep 17 00:00:00 2001 From: Andrew Wong Date: Thu, 7 Aug 2003 07:19:45 +0000 Subject: [PATCH] fix extra stage bug with auto-select mode --- stepmania/src/MusicWheel.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp index 2a27f82ba3..eadd4f5672 100644 --- a/stepmania/src/MusicWheel.cpp +++ b/stepmania/src/MusicWheel.cpp @@ -169,8 +169,10 @@ MusicWheel::MusicWheel() // HACK: invalidate currently selected song in the case that it // cannot be played due to lack of stages remaining - if( GAMESTATE->m_pCurSong != NULL && SongManager::GetNumStagesForSong( GAMESTATE->m_pCurSong ) + GAMESTATE->m_iCurrentStageIndex > PREFSMAN->m_iNumArcadeStages) - GAMESTATE->m_pCurSong = NULL; + if( GAMESTATE->m_pCurSong != NULL && + SongManager::GetNumStagesForSong( GAMESTATE->m_pCurSong ) + GAMESTATE->m_iCurrentStageIndex > PREFSMAN->m_iNumArcadeStages + && !GAMESTATE->IsExtraStage() && !GAMESTATE->IsExtraStage2() ) + GAMESTATE->m_pCurSong = NULL; // If there is no currently selected song, select one. if( GAMESTATE->m_pCurSong == NULL )