From 1c976dc33839325f4a82682f6f85fe754eb71d4e Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 7 Jan 2003 01:23:41 +0000 Subject: [PATCH] escape in main menu selects exit f1 goes to demo --- stepmania/src/ScreenTitleMenu.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp index 3a82c2f18a..fc073c66c2 100644 --- a/stepmania/src/ScreenTitleMenu.cpp +++ b/stepmania/src/ScreenTitleMenu.cpp @@ -190,7 +190,13 @@ void ScreenTitleMenu::Input( const DeviceInput& DeviceI, const InputEventType ty if( m_Fade.IsClosing() ) return; - + + if(DeviceI.device == DEVICE_KEYBOARD && DeviceI.button == SDLK_F1 && type == IET_FIRST_PRESS) + { + this->SendScreenMessage( SM_FadeToDemonstration, 0 ); + return; + } + Screen::Input( DeviceI, type, GameI, MenuI, StyleI ); } @@ -403,6 +409,12 @@ void ScreenTitleMenu::MenuStart( PlayerNumber pn ) void ScreenTitleMenu::MenuBack( PlayerNumber pn ) { - this->SendScreenMessage( SM_FadeToDemonstration, 0 ); + if(m_TitleMenuChoice == CHOICE_EXIT) + return; + + LoseFocus( m_TitleMenuChoice ); + m_TitleMenuChoice = CHOICE_EXIT; + m_soundChange.PlayRandom(); + GainFocus( m_TitleMenuChoice ); }