From 81c04f883ae367cf72cb33a255b20f8778420bf3 Mon Sep 17 00:00:00 2001 From: Laurence Hartje Date: Mon, 3 Feb 2003 00:36:53 +0000 Subject: [PATCH] Fix issue when holding back would cause slowdowns on the final eval screen and would result in a ton of StageStats being pushed onto m_vPassedStageStats --- stepmania/src/MenuElements.h | 2 +- stepmania/src/ScreenEvaluation.cpp | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/stepmania/src/MenuElements.h b/stepmania/src/MenuElements.h index e25fe7065f..309533bdf6 100644 --- a/stepmania/src/MenuElements.h +++ b/stepmania/src/MenuElements.h @@ -54,7 +54,7 @@ public: void TweenOnScreenFromBlack( ScreenMessage smSendWhenDone ); void TweenOffScreenToBlack( ScreenMessage smSendWhenDone, bool bPlayBackSound ); - bool IsClosing() { return m_Wipe.IsClosing() || m_KeepAlive.IsClosing(); }; + bool IsClosing() { return m_Wipe.IsClosing() || m_KeepAlive.IsClosing() || m_Invisible.IsClosing(); }; protected: void TweenTopLayerOnScreen(float tm=-1); diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 9b5121cfdd..8c9b2245bb 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -821,12 +821,18 @@ void ScreenEvaluation::MenuStart( PlayerNumber pn ) SCREENMAN->SendMessageToTopScreen( SM_GoToFinalEvaluation, MENU_ELEMENTS_TWEEN_TIME ); } } + else if( m_ResultMode == RM_ARCADE_SUMMARY ) + { + m_Menu.TweenOffScreenToBlack( SM_GoToGameFinished, false ); + //Don't want to update song stats again.... If the else case is supposed to handle this, then add + //the return to the else case, and remove this case. + return; + } else m_Menu.TweenOffScreenToBlack( SM_GoToGameFinished, false ); } GAMESTATE->m_iCurrentStageIndex++; // Increment the stage counter. - GAMESTATE->m_vPassedStageStats.push_back( GAMESTATE->m_CurStageStats ); // Save this stage's stats }