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

Merge branch 'console-in-menus-mk-ii' into 'master' 

Console in menus again!

See merge request STJr/SRB2!797
This commit is contained in:
James R 2020-02-23 18:15:43 -05:00
parent 95b8f950b4 b78fc670d0
commit 711c8ed6b4
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/console.c
View File

@ -613,15 +613,6 @@ void CON_Ticker(void)
con_tick++;
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
if (consoletoggle)
{
@ -793,7 +784,7 @@ boolean CON_Responder(event_t *ev)
// check other keys only if console prompt is active
if (!consoleready && key < NUMINPUTS) // metzgermeister: boundary check!!
{
if (bindtable[key])
if (! menuactive && bindtable[key])
{
COM_BufAddText(bindtable[key]);
COM_BufAddText("\n");

6
src/d_main.c
View File

@ -508,13 +508,11 @@ static void D_Display(void)
// vid size change is now finished if it was on...
vid.recalc = 0;
// FIXME: draw either console or menu, not the two
if (gamestate != GS_TIMEATTACK)
CON_Drawer();
M_Drawer(); // menu is drawn even on top of everything
// focus lost moved to M_Drawer
CON_Drawer();
//
// wipe update
//

4
src/m_menu.c
View File

@ -3153,6 +3153,9 @@ boolean M_Responder(event_t *ev)
if (gamestate == GS_TITLESCREEN && finalecount < TICRATE)
return false;
if (CON_Ready())
return false;
if (noFurtherInput)
{
// Ignore input after enter/escape/other buttons
@ -3512,6 +3515,7 @@ boolean M_Responder(event_t *ev)
return false;
default:
CON_Responder(ev);
break;
}