zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

- always pause the game when the console is open.

Browse source
This commit is contained in:
Christoph Oelckers 2019-12-07 10:01:03 +01:00
parent ddfb2223db
commit ef87d2d4f9
3 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/common/menu/menu.cpp
View file

@ -922,7 +922,7 @@ void Menu_Close(int playerid)
bool M_Active() bool M_Active()
{ {
return DMenu::CurrentMenu != nullptr; return DMenu::CurrentMenu != nullptr || ConsoleState == c_down || ConsoleState == c_falling;
} }
//============================================================================= //=============================================================================

6
source/sw/src/game.cpp
View file

@ -1999,12 +1999,6 @@ void MenuLevel(void)
break; break;
} }
// force the use of menus at all time
if (!M_Active() && !ConPanel)
{
inputState.SetKeyStatus(sc_Escape);
}
// must lock the clock for drawing so animations will happen // must lock the clock for drawing so animations will happen
totalclocklock = totalclock; totalclocklock = totalclock;

2
source/sw/src/player.cpp
View file

@ -2478,7 +2478,7 @@ MoveScrollMode2D(PLAYERp pp)
} }
} }
if (!M_Active() && !HelpInputMode && !ConPanel) if (!HelpInputMode && !ConPanel)
{ {
if (buttonMap.ButtonDown(gamefunc_Move_Forward)) if (buttonMap.ButtonDown(gamefunc_Move_Forward))
{ {