Fix not delaying BACK on ScreenGameplay.
This commit is contained in:
@@ -1506,27 +1506,9 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ
|
|||||||
return;
|
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 &&
|
if( MenuI.button == MENU_BUTTON_BACK &&
|
||||||
((!PREFSMAN->m_bDelayedEscape && type==IET_FIRST_PRESS) ||
|
((!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)) )
|
(DeviceI.device!=DEVICE_KEYBOARD && type==IET_FAST_REPEAT)) )
|
||||||
{
|
{
|
||||||
m_DancingState = STATE_OUTRO;
|
m_DancingState = STATE_OUTRO;
|
||||||
@@ -1550,6 +1532,24 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ
|
|||||||
m_Back.StartTransitioning( SM_SaveChangedBeforeGoingBack );
|
m_Back.StartTransitioning( SM_SaveChangedBeforeGoingBack );
|
||||||
return;
|
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. */
|
/* Nothing else cares about releases. */
|
||||||
|
|||||||
Reference in New Issue
Block a user