actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

play Cancel on whichever transition is used to cancel; let it play the sound, if wanted; use Cancel in ScreenWithMenuElementsSimple::MenuBack

Browse Source
This commit is contained in:
Glenn Maynard
2006-06-28 04:18:46 +00:00
parent 9d8dd666a1
commit 79b819cfba
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenWithMenuElements.cpp
+3 -2
View File
@@ -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() );
}