From 7c022ff16698d7de4c28d7e12b9eaaa9174dc948 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 24 Apr 2005 02:21:25 +0000 Subject: [PATCH] fix "can give up while the next song is loading, putting the next song animation in a messed up state" --- stepmania/src/ScreenGameplay.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 036053bd8c..9fc37944f0 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -2163,6 +2163,8 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM ) } else if( SM == SM_NotesEnded ) // received while STATE_DANCING { + AbortGiveUp( false ); // don't allow giveup while the next song is loading + /* Do this in LoadNextSong, so we don't tween off old attacks until * m_NextSong finishes. */ // GAMESTATE->RemoveAllActiveAttacks();