From 16686b164e34ecc4064b9957ab070d94b90422d4 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 21 Feb 2004 21:00:49 +0000 Subject: [PATCH] fix final eval banners showing up for songs that were backed out of --- stepmania/src/ScreenGameplay.cpp | 11 ++++++----- stepmania/src/ScreenGameplay.h | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 85e7f40fd6..cc24999217 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -1802,7 +1802,7 @@ void ScreenGameplay::SongFinished() GAMESTATE->RemoveAllActiveAttacks(); } -void ScreenGameplay::StageFinished() +void ScreenGameplay::StageFinished( bool bBackedOut ) { if( GAMESTATE->IsCourseMode() && GAMESTATE->m_PlayMode != PLAY_MODE_ENDLESS ) { @@ -1825,7 +1825,8 @@ void ScreenGameplay::StageFinished() } // save current stage stats - g_vPlayedStageStats.push_back( g_CurStageStats ); + if( !bBackedOut ) + g_vPlayedStageStats.push_back( g_CurStageStats ); /* Reset options. */ GAMESTATE->RestoreSelectedOptions(); @@ -2086,7 +2087,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM ) case SM_GoToScreenAfterBack: SongFinished(); - StageFinished(); + StageFinished( true ); GAMESTATE->CancelStage(); @@ -2102,7 +2103,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM ) } SongFinished(); - StageFinished(); + StageFinished( false ); SCREENMAN->SetNewScreen( NEXT_SCREEN(GAMESTATE->m_PlayMode) ); break; @@ -2159,7 +2160,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM ) } SongFinished(); - StageFinished(); + StageFinished( false ); switch( GAMESTATE->m_PlayMode ) { diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index bd15d63bb9..ac5e75d3e2 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -86,7 +86,7 @@ protected: void UpdateLyrics( float fDeltaTime ); void UpdateCheckFail(); void SongFinished(); - void StageFinished(); + void StageFinished( bool bBackedOut ); enum DancingState { STATE_INTRO = 0, // not allowed to press Back