Permit tertiary and ... quadridly(?) gamecontrol binds for console open/close, which had been silently broken for years.

This commit is contained in:
toaster 2023-04-02 20:39:38 +01:00
parent ed3ed6f189
commit 2d175c6094

View file

@ -913,7 +913,8 @@ boolean CON_Responder(event_t *ev)
// let go keyup events, don't eat them // let go keyup events, don't eat them
if (ev->type != ev_keydown && ev->type != ev_console) if (ev->type != ev_keydown && ev->type != ev_console)
{ {
if (ev->data1 == gamecontrol[0][gc_console][0] || ev->data1 == gamecontrol[0][gc_console][1]) if (ev->data1 == gamecontrol[0][gc_console][0] || ev->data1 == gamecontrol[0][gc_console][1]
|| ev->data1 == gamecontrol[0][gc_console][2] || ev->data1 == gamecontrol[0][gc_console][3])
consdown = false; consdown = false;
return false; return false;
} }
@ -933,7 +934,8 @@ boolean CON_Responder(event_t *ev)
INT32 i; INT32 i;
for (i = 0; i < num_gamecontrols; i++) for (i = 0; i < num_gamecontrols; i++)
{ {
if (gamecontrol[0][i][0] == ev->data1 || gamecontrol[0][i][1] == ev->data1) if (gamecontrol[0][i][0] == ev->data1 || gamecontrol[0][i][1] == ev->data1
|| gamecontrol[0][i][2] == ev->data1 || gamecontrol[0][i][3] == ev->data1)
break; break;
} }
@ -941,7 +943,8 @@ boolean CON_Responder(event_t *ev)
return false; return false;
} }
if (key == gamecontrol[0][gc_console][0] || key == gamecontrol[0][gc_console][1]) if (key == gamecontrol[0][gc_console][0] || key == gamecontrol[0][gc_console][1]
|| key == gamecontrol[0][gc_console][2] || key == gamecontrol[0][gc_console][3])
{ {
if (consdown) // ignore repeat if (consdown) // ignore repeat
return true; return true;