From 7be96be7a2ddf45d6f5e801bfc195aa2116c40ce Mon Sep 17 00:00:00 2001 From: Andrew Livy Date: Tue, 11 Nov 2003 18:05:28 +0000 Subject: [PATCH] Fix: Failed ONI / Extra Stages shouldnt show Game Over --- stepmania/src/ScreenCredits.cpp | 1 + stepmania/src/ScreenEvaluation.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ScreenCredits.cpp b/stepmania/src/ScreenCredits.cpp index 9b2afef55a..2e7aa7648d 100644 --- a/stepmania/src/ScreenCredits.cpp +++ b/stepmania/src/ScreenCredits.cpp @@ -63,6 +63,7 @@ const CreditLine CREDIT_LINES[] = {2,"☆☆GRAPHICS☆☆"}, {0,"Lucas “v1ral” Tang"}, // "Who?" = "what is this person's real name", not "what did they do". + // Who knows? Some people might not want to reveal their real name. - Friez. {0,"SPiGuMuS"}, // who? {0,"Visage"}, // who? makes para para theme graphics for me, wants to do BM and IIDX graphics too. - Friez {0,"Ryan “DJ McFox” McKanna"}, diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index a7a9524244..b120dbcbf3 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -1082,7 +1082,7 @@ void ScreenEvaluation::HandleScreenMessage( const ScreenMessage SM ) MenuStart( PLAYER_INVALID ); break; case SM_GoToNextScreen: - if(m_bFailed && !PREFSMAN->m_bEventMode) // if failed and not in event mode go to gameover screen + if(m_bFailed && !PREFSMAN->m_bEventMode && !(GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2()) && GAMESTATE->m_PlayMode == PLAY_MODE_ARCADE) // if failed and not in event mode go to gameover screen SCREENMAN->SetNewScreen( FAILED_SCREEN ); else SCREENMAN->SetNewScreen( NEXT_SCREEN ); @@ -1091,7 +1091,7 @@ void ScreenEvaluation::HandleScreenMessage( const ScreenMessage SM ) SCREENMAN->SetNewScreen( "ScreenSelectCourse" ); break; case SM_GoToEndScreen: - if(m_bFailed && !PREFSMAN->m_bEventMode) // if failed and not in event mode go to gameover screen + if(m_bFailed && !PREFSMAN->m_bEventMode && !(GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2()) && GAMESTATE->m_PlayMode == PLAY_MODE_ARCADE) // if failed and not in event mode go to gameover screen SCREENMAN->SetNewScreen( FAILED_SCREEN ); else SCREENMAN->SetNewScreen( END_SCREEN );