From 3179797331b37870a3f500ac016a68551d4d9c20 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Thu, 9 Jan 2020 22:16:46 -0800
Subject: [PATCH] Let Escape close the console
---
src/console.c | 2 +-
src/d_main.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/console.c b/src/console.c
index 01d1ddaa2..5a74c85b6 100644
--- a/src/console.c
+++ b/src/console.c
@@ -777,7 +777,7 @@ boolean CON_Responder(event_t *ev)
// check for console toggle key
if (ev->type != ev_console)
{
- if (modeattacking || metalrecording)
+ if (modeattacking || metalrecording || menuactive)
return false;
if (key == gamecontrol[gc_console][0] || key == gamecontrol[gc_console][1])
diff --git a/src/d_main.c b/src/d_main.c
index e55c65bbb..62ec9e449 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -188,14 +188,14 @@ void D_ProcessEvents(void)
continue;
}
- // Menu input
- if (M_Responder(ev))
- continue; // menu ate the event
-
// console input
if (CON_Responder(ev))
continue; // ate the event
+ // Menu input
+ if (M_Responder(ev))
+ continue; // menu ate the event
+
G_Responder(ev);
}
}
--
GitLab