Esc should ignore "delayed back" pref. Oops.

This commit is contained in:
Chris Danford
2003-10-08 07:22:27 +00:00
parent d3073eb988
commit 19a16e6713
3 changed files with 3 additions and 6 deletions
+1 -1
View File
@@ -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. */ /* Don't make the user hold the back button if they're pressing escape. */
if( DeviceI.device == DEVICE_KEYBOARD && DeviceI.button == SDLK_ESCAPE ) if( DeviceI.device == DEVICE_KEYBOARD && DeviceI.button == SDLK_ESCAPE )
{ {
this->MenuBack( MenuI.player, type ); this->MenuBack( MenuI.player );
return; return;
} }
+1 -4
View File
@@ -223,11 +223,8 @@ void ScreenMiniMenu::MenuStart( PlayerNumber pn, const InputEventType type )
COPY( s_iLastAnswers, m_iCurAnswers ); 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 ); m_Out.StartTransitioning( SM_GoToCancel );
} }
+1 -1
View File
@@ -79,7 +79,7 @@ protected:
void MenuDown( PlayerNumber pn, const InputEventType type ); void MenuDown( PlayerNumber pn, const InputEventType type );
void MenuLeft( PlayerNumber pn, const InputEventType type ); void MenuLeft( PlayerNumber pn, const InputEventType type );
void MenuRight( 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 ); void MenuStart( PlayerNumber pn, const InputEventType type );
int GetGoUpSpot(); // return -1 if can't go up int GetGoUpSpot(); // return -1 if can't go up