From 19a16e671336a4eba1aaac8c2a0ca23dc28fc34a Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Wed, 8 Oct 2003 07:22:27 +0000 Subject: [PATCH] Esc should ignore "delayed back" pref. Oops. --- stepmania/src/Screen.cpp | 2 +- stepmania/src/ScreenMiniMenu.cpp | 5 +---- stepmania/src/ScreenMiniMenu.h | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/stepmania/src/Screen.cpp b/stepmania/src/Screen.cpp index 2327d7e835..43e8399226 100644 --- a/stepmania/src/Screen.cpp +++ b/stepmania/src/Screen.cpp @@ -129,7 +129,7 @@ void Screen::Input( const DeviceInput& DeviceI, const InputEventType type, const /* Don't make the user hold the back button if they're pressing escape. */ if( DeviceI.device == DEVICE_KEYBOARD && DeviceI.button == SDLK_ESCAPE ) { - this->MenuBack( MenuI.player, type ); + this->MenuBack( MenuI.player ); return; } diff --git a/stepmania/src/ScreenMiniMenu.cpp b/stepmania/src/ScreenMiniMenu.cpp index 3bd063258f..19fe4a0d80 100644 --- a/stepmania/src/ScreenMiniMenu.cpp +++ b/stepmania/src/ScreenMiniMenu.cpp @@ -223,11 +223,8 @@ void ScreenMiniMenu::MenuStart( PlayerNumber pn, const InputEventType type ) COPY( s_iLastAnswers, m_iCurAnswers ); } -void ScreenMiniMenu::MenuBack( PlayerNumber pn, const InputEventType type ) +void ScreenMiniMenu::MenuBack( PlayerNumber pn ) { - if( type == IET_RELEASE ) - return; - m_Out.StartTransitioning( SM_GoToCancel ); } diff --git a/stepmania/src/ScreenMiniMenu.h b/stepmania/src/ScreenMiniMenu.h index 2d453236d1..cbd3691dd7 100644 --- a/stepmania/src/ScreenMiniMenu.h +++ b/stepmania/src/ScreenMiniMenu.h @@ -79,7 +79,7 @@ protected: void MenuDown( PlayerNumber pn, const InputEventType type ); void MenuLeft( PlayerNumber pn, const InputEventType type ); void MenuRight( PlayerNumber pn, const InputEventType type ); - void MenuBack( PlayerNumber pn, const InputEventType type ); + void MenuBack( PlayerNumber pn ); void MenuStart( PlayerNumber pn, const InputEventType type ); int GetGoUpSpot(); // return -1 if can't go up