From 425cc61c4c84db06569d4a2b8d0f43c5de7b0b0e Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sun, 23 Feb 2025 06:47:44 +0300 Subject: [PATCH] engine: client: handle K_ESCAPE in Key_Console, remove special case for it in Key_Event --- engine/client/console.c | 20 ++++++++++---------- engine/client/keys.c | 14 ++------------ 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/engine/client/console.c b/engine/client/console.c index 45bd2750..deb062aa 100644 --- a/engine/client/console.c +++ b/engine/client/console.c @@ -1467,6 +1467,16 @@ Handles history and console scrollback */ void Key_Console( int key ) { + // exit the console by pressing MINUS on NSwitch + // or both Back(Select)/Start buttons for everyone else + if( key == K_BACK_BUTTON || key == K_START_BUTTON || key == K_ESCAPE ) + { + if( cls.state == ca_active && !cl.background ) + Key_SetKeyDest( key_game ); + else UI_SetActiveMenu( true ); + return; + } + // ctrl-L clears screen if( key == 'l' && Key_IsDown( K_CTRL )) { @@ -1575,16 +1585,6 @@ void Key_Console( int key ) return; } - // exit the console by pressing MINUS on NSwitch - // or both Back(Select)/Start buttons for everyone else - if( key == K_BACK_BUTTON || key == K_START_BUTTON ) - { - if( cls.state == ca_active && !cl.background ) - Key_SetKeyDest( key_game ); - else UI_SetActiveMenu( true ); - return; - } - // pass to the normal editline routine Field_KeyDownEvent( &con.input, key ); } diff --git a/engine/client/keys.c b/engine/client/keys.c index 0d924d20..ee88f06d 100644 --- a/engine/client/keys.c +++ b/engine/client/keys.c @@ -726,18 +726,8 @@ void GAME_EXPORT Key_Event( int key, int down ) return; // handled in client.dll } break; - case key_message: - Key_Message( key ); - return; - case key_console: - if( cls.state == ca_active && !cl.background ) - Key_SetKeyDest( key_game ); - else UI_SetActiveMenu( true ); - return; - case key_menu: - UI_KeyEvent( key, true ); - return; - default: return; + default: + break; } }