From d24962241e52c648580d16f757cf9bd179f9b504 Mon Sep 17 00:00:00 2001 From: Fabian Greffrath Date: Tue, 18 Oct 2022 21:42:44 +0200 Subject: [PATCH] disable toggles and menu shortcuts when typing on chat (#770) Fixes #767, thanks @MrAlaux --- src/m_menu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index eb243d29..85a8c814 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -5282,7 +5282,7 @@ boolean M_Responder (event_t* ev) // If there is no active menu displayed... - if (!menuactive) // phares + if (!menuactive && !chat_on) // phares { // | if (M_InputActivated(input_autorun)) // Autorun // V { @@ -5404,7 +5404,7 @@ boolean M_Responder (event_t* ev) if (M_InputActivated(input_zoomout)) // zoom out { - if (automapactive || chat_on) + if (automapactive) return false; M_SizeDisplay(0); S_StartSound(NULL,sfx_stnmov); @@ -5413,7 +5413,7 @@ boolean M_Responder (event_t* ev) if (M_InputActivated(input_zoomin)) // zoom in { // jff 2/23/98 - if (automapactive || chat_on) // allow + if (automapactive) // allow return false; // key_hud==key_zoomin M_SizeDisplay(1); // ^ S_StartSound(NULL,sfx_stnmov); // | @@ -5422,7 +5422,7 @@ boolean M_Responder (event_t* ev) if (M_InputActivated(input_hud)) // heads-up mode { - if ((automapactive && !automapoverlay) || chat_on) // jff 2/22/98 + if (automapactive && !automapoverlay) // jff 2/22/98 return false; // HUD mode control if (screenSize<8) // function on default F5 while (screenSize<8 || !hud_displayed) // make hud visible