zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-06 15:11:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move CONTROL_ProcessBinds() call to P_GetInput()

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7135 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2018-10-25 23:34:08 +00:00
parent 7edcdb0ae4
commit 7c4ba73bfd
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6760,10 +6760,7 @@ MAIN_LOOP_RESTART:
if (((g_netClient || g_netServer) || !(g_player[myconnectindex].ps->gm & (MODE_MENU|MODE_DEMO))) && totalclock >= ototalclock+TICSPERFRAME) if (((g_netClient || g_netServer) || !(g_player[myconnectindex].ps->gm & (MODE_MENU|MODE_DEMO))) && totalclock >= ototalclock+TICSPERFRAME)
{ {
if (g_networkMode != NET_DEDICATED_SERVER) if (g_networkMode != NET_DEDICATED_SERVER)
{
CONTROL_ProcessBinds();
P_GetInput(myconnectindex); P_GetInput(myconnectindex);
}
Bmemcpy(&inputfifo[0][myconnectindex], &localInput, sizeof(input_t)); Bmemcpy(&inputfifo[0][myconnectindex], &localInput, sizeof(input_t));

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

@ -2885,6 +2885,8 @@ void P_GetInput(int playerNum)
return; return;
} }
CONTROL_ProcessBinds();
if (ud.mouseaiming) if (ud.mouseaiming)
g_myAimMode = BUTTON(gamefunc_Mouse_Aiming); g_myAimMode = BUTTON(gamefunc_Mouse_Aiming);
else else