lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into next

This commit is contained in:
James R 2020-02-16 17:35:59 -08:00
parent b2168aba3b 753829c826
commit e245354c80
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/console.c
View File

@ -613,6 +613,15 @@ void CON_Ticker(void)
con_tick++; con_tick++;
con_tick &= 7; con_tick &= 7;
// if the menu is open then close the console.
if (menuactive && con_destlines)
{
consoletoggle = false;
con_destlines = 0;
CON_ClearHUD();
I_UpdateMouseGrab();
}
// console key was pushed // console key was pushed
if (consoletoggle) if (consoletoggle)
{ {
@ -784,7 +793,7 @@ boolean CON_Responder(event_t *ev)
// check other keys only if console prompt is active // check other keys only if console prompt is active
if (!consoleready && key < NUMINPUTS) // metzgermeister: boundary check!! if (!consoleready && key < NUMINPUTS) // metzgermeister: boundary check!!
{ {
if (! menuactive && bindtable[key]) if (bindtable[key])
{ {
COM_BufAddText(bindtable[key]); COM_BufAddText(bindtable[key]);
COM_BufAddText("\n"); COM_BufAddText("\n");

15
src/d_main.c
View File

@ -188,14 +188,14 @@ void D_ProcessEvents(void)
continue; continue;
} }
// console input
if (CON_Responder(ev))
continue; // ate the event
// Menu input // Menu input
if (M_Responder(ev)) if (M_Responder(ev))
continue; // menu ate the event continue; // menu ate the event
// console input
if (CON_Responder(ev))
continue; // ate the event
G_Responder(ev); G_Responder(ev);
} }
} }
@ -502,12 +502,13 @@ static void D_Display(void)
// vid size change is now finished if it was on... // vid size change is now finished if it was on...
vid.recalc = 0; vid.recalc = 0;
M_Drawer(); // menu is drawn even on top of everything // FIXME: draw either console or menu, not the two
// focus lost moved to M_Drawer
if (gamestate != GS_TIMEATTACK) if (gamestate != GS_TIMEATTACK)
CON_Drawer(); CON_Drawer();
M_Drawer(); // menu is drawn even on top of everything
// focus lost moved to M_Drawer
// //
// wipe update // wipe update
// //