From 311e0911a8e88336719ed9324d909c8a909da18d Mon Sep 17 00:00:00 2001
From: spherallic <spherallic@gmail.com>
Date: Wed, 11 Jan 2023 13:53:59 +0100
Subject: [PATCH] Fix continue screen & console for gamepad input
---
src/console.c | 7 ++++---
src/f_finale.c | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/console.c b/src/console.c
index 7cad4aee53..ed99dd8b67 100644
--- a/src/console.c
+++ b/src/console.c
@@ -918,14 +918,15 @@ boolean CON_Responder(event_t *ev)
static INT32 alias_skips;
const char *cmd = NULL;
- INT32 key = ev->key;
+ INT32 type = ev->type;
+ INT32 key = G_RemapGamepadEvent(ev, &type);
boolean key_is_console = (key == gamecontrol[GC_CONSOLE][0] || key == gamecontrol[GC_CONSOLE][1]);
if (chat_on)
return false;
// let go keyup events, don't eat them
- if (ev->type != ev_keydown && ev->type != ev_console)
+ if (type != ev_keydown && type != ev_console)
{
if (key_is_console)
consdown = false;
@@ -933,7 +934,7 @@ boolean CON_Responder(event_t *ev)
}
// check for console toggle key
- if (ev->type != ev_console)
+ if (type != ev_console)
{
if (modeattacking || metalrecording || marathonmode)
return false;
diff --git a/src/f_finale.c b/src/f_finale.c
index 307e00aaa2..9f5380315f 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -3828,7 +3828,7 @@ boolean F_ContinueResponder(event_t *event)
if (timetonext >= 21*TICRATE/2)
return false;
- if (event->type != ev_keydown)
+ if (type != ev_keydown)
return false;
// remap virtual keys (mouse & gamepad buttons)
--
GitLab