From b78fc670d0824e2054d102706813087d0086c331 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Mon, 17 Feb 2020 17:10:29 -0800
Subject: [PATCH] Don't let console open with menu keys while the menu is open
---
src/d_main.c | 8 ++++----
src/m_menu.c | 4 ++++
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/d_main.c b/src/d_main.c
index 6b51648944..cff6b88053 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -188,14 +188,14 @@ void D_ProcessEvents(void)
continue;
}
- // console input
- if (CON_Responder(ev))
- continue; // ate the event
-
// Menu input
if (M_Responder(ev))
continue; // menu ate the event
+ // console input
+ if (CON_Responder(ev))
+ continue; // ate the event
+
G_Responder(ev);
}
}
diff --git a/src/m_menu.c b/src/m_menu.c
index dbe5d854f6..687f870517 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -3150,6 +3150,9 @@ boolean M_Responder(event_t *ev)
if (gamestate == GS_TITLESCREEN && finalecount < TICRATE)
return false;
+ if (CON_Ready())
+ return false;
+
if (noFurtherInput)
{
// Ignore input after enter/escape/other buttons
@@ -3509,6 +3512,7 @@ boolean M_Responder(event_t *ev)
return false;
default:
+ CON_Responder(ev);
break;
}
--
GitLab