zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-13 07:58:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix gamepad analogs not working in menus when in game

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7987 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2019-08-14 03:04:01 +00:00 committed by Christoph Oelckers
parent cb405ced52
commit a29869f86e
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/duke3d/src/game.cpp
View file

@ -199,7 +199,7 @@ void G_HandleSpecialKeys(void)
auto &myplayer = *g_player[myconnectindex].ps; auto &myplayer = *g_player[myconnectindex].ps;
// we need CONTROL_GetInput in order to pick up joystick button presses // we need CONTROL_GetInput in order to pick up joystick button presses
if (CONTROL_Started && !(myplayer.gm & MODE_GAME)) if (CONTROL_Started && (!(myplayer.gm & MODE_GAME) || (myplayer.gm & MODE_MENU)))
{ {
ControlInfo noshareinfo; ControlInfo noshareinfo;
CONTROL_GetInput(&noshareinfo); CONTROL_GetInput(&noshareinfo);

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

@ -4603,6 +4603,8 @@ void Menu_Close(uint8_t playerID)
walock[TILE_SAVESHOT] = 1; walock[TILE_SAVESHOT] = 1;
G_UpdateScreenArea(); G_UpdateScreenArea();
S_PauseSounds(false); S_PauseSounds(false);
I_ClearAllInput();
} }
} }