stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-17 23:21:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'escape-console' into 'master'

Browse source 
Let Escape close the console

See merge request STJr/SRB2!664
This commit is contained in:
James R 2020-01-12 15:38:35 -05:00
commit 5d6d6a7d4d
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/console.c
View file

@ -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])

8
src/d_main.c
View file

@ -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);
}
}