From 56fb416bb1aa7c8014547a00a5b753d9cc19edf3 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 15 Feb 2004 02:06:39 +0000 Subject: [PATCH] Fix not delaying BACK on ScreenGameplay. --- stepmania/src/ScreenGameplay.cpp | 38 ++++++++++++++++---------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 4bcc57811a..d234bb65b8 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -1506,27 +1506,9 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ return; } - if( MenuI.button == MENU_BUTTON_BACK && PREFSMAN->m_bDelayedEscape && type==IET_FIRST_PRESS) - { - m_textDebug.SetText( "Continue holding BACK to quit" ); - m_textDebug.StopTweening(); - m_textDebug.SetDiffuse( RageColor(1,1,1,0) ); - m_textDebug.BeginTweening( 1/8.f ); - m_textDebug.SetDiffuse( RageColor(1,1,1,1) ); - return; - } - - if( MenuI.button == MENU_BUTTON_BACK && PREFSMAN->m_bDelayedEscape && type==IET_RELEASE ) - { - m_textDebug.StopTweening(); - m_textDebug.BeginTweening( 1/8.f ); - m_textDebug.SetDiffuse( RageColor(1,1,1,0) ); - return; - } - if( MenuI.button == MENU_BUTTON_BACK && ((!PREFSMAN->m_bDelayedEscape && type==IET_FIRST_PRESS) || - (DeviceI.device==DEVICE_KEYBOARD && (type==IET_SLOW_REPEAT||type==IET_FAST_REPEAT)) || + DeviceI.device==DEVICE_KEYBOARD || (DeviceI.device!=DEVICE_KEYBOARD && type==IET_FAST_REPEAT)) ) { m_DancingState = STATE_OUTRO; @@ -1550,6 +1532,24 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ m_Back.StartTransitioning( SM_SaveChangedBeforeGoingBack ); return; } + + if( MenuI.button == MENU_BUTTON_BACK && PREFSMAN->m_bDelayedEscape && type==IET_FIRST_PRESS) + { + m_textDebug.SetText( "Continue holding BACK to quit" ); + m_textDebug.StopTweening(); + m_textDebug.SetDiffuse( RageColor(1,1,1,0) ); + m_textDebug.BeginTweening( 1/8.f ); + m_textDebug.SetDiffuse( RageColor(1,1,1,1) ); + return; + } + + if( MenuI.button == MENU_BUTTON_BACK && PREFSMAN->m_bDelayedEscape && type==IET_RELEASE ) + { + m_textDebug.StopTweening(); + m_textDebug.BeginTweening( 1/8.f ); + m_textDebug.SetDiffuse( RageColor(1,1,1,0) ); + return; + } } /* Nothing else cares about releases. */