Don't let console open with menu keys while the menu is open

This commit is contained in:
James R 2020-02-17 17:10:29 -08:00
parent b2733eba73
commit b78fc670d0
2 changed files with 8 additions and 4 deletions

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

View file

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