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

Amend r7987 to only clear input if actually in the menu

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@8008 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2019-08-14 17:15:34 +00:00 committed by Christoph Oelckers
parent 108a71cadb
commit 002a52033d
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/duke3d/src/menus.cpp
View file

@ -4538,10 +4538,14 @@ void Menu_Open(uint8_t playerID)
void Menu_Close(uint8_t playerID)
{
if (g_player[playerID].ps->gm & MODE_GAME)
auto & gm = g_player[playerID].ps->gm;
if (gm & MODE_GAME)
{
if (gm & MODE_MENU)
I_ClearAllInput();
// The following lines are here so that you cannot close the menu when no game is running.
g_player[playerID].ps->gm &= ~MODE_MENU;
gm &= ~MODE_MENU;
mouseLockToWindow(1);
if ((!g_netServer && ud.multimode < 2) && ud.recstat != 2)
@ -4562,8 +4566,6 @@ void Menu_Close(uint8_t playerID)
walock[TILE_SAVESHOT] = 1;
G_UpdateScreenArea();
S_PauseSounds(false);
I_ClearAllInput();
}
}