From 79b819cfba13913a1c3edb045dc231fab7716830 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 28 Jun 2006 04:18:46 +0000 Subject: [PATCH] play Cancel on whichever transition is used to cancel; let it play the sound, if wanted; use Cancel in ScreenWithMenuElementsSimple::MenuBack --- stepmania/src/ScreenWithMenuElements.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ScreenWithMenuElements.cpp b/stepmania/src/ScreenWithMenuElements.cpp index 0234133490..955bc696ac 100644 --- a/stepmania/src/ScreenWithMenuElements.cpp +++ b/stepmania/src/ScreenWithMenuElements.cpp @@ -290,8 +290,8 @@ void ScreenWithMenuElements::Cancel( ScreenMessage smSendWhenDone ) if( CANCEL_TRANSITIONS_OUT ) { - SCREENMAN->PlayCancelSound(); StartTransitioningScreen( smSendWhenDone ); + COMMAND( m_Out, "Cancel" ); return; } @@ -304,6 +304,7 @@ void ScreenWithMenuElements::Cancel( ScreenMessage smSendWhenDone ) if( m_MenuTimer ) m_MenuTimer->Stop(); m_Cancel.StartTransitioning( smSendWhenDone ); + COMMAND( m_Cancel, "Cancel" ); } bool ScreenWithMenuElements::IsTransitioning() @@ -338,7 +339,7 @@ void ScreenWithMenuElementsSimple::MenuBack( PlayerNumber pn ) if( m_fLockInputSecs > 0 ) return; - StartTransitioningScreen( SM_GoToPrevScreen ); + Cancel( SM_GoToPrevScreen ); SCREENMAN->ConcurrentlyPrepareScreen( GetNextScreen() ); }