From 7c4ba73bfd71454a87eaaeb3171f7cd1dbe5924f Mon Sep 17 00:00:00 2001 From: terminx Date: Thu, 25 Oct 2018 23:34:08 +0000 Subject: [PATCH] Move CONTROL_ProcessBinds() call to P_GetInput() git-svn-id: https://svn.eduke32.com/eduke32@7135 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/duke3d/src/game.cpp | 3 --- source/duke3d/src/player.cpp | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/source/duke3d/src/game.cpp b/source/duke3d/src/game.cpp index cc07b0172..031816dfb 100644 --- a/source/duke3d/src/game.cpp +++ b/source/duke3d/src/game.cpp @@ -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_networkMode != NET_DEDICATED_SERVER) - { - CONTROL_ProcessBinds(); P_GetInput(myconnectindex); - } Bmemcpy(&inputfifo[0][myconnectindex], &localInput, sizeof(input_t)); diff --git a/source/duke3d/src/player.cpp b/source/duke3d/src/player.cpp index cac634693..be83f8d54 100644 --- a/source/duke3d/src/player.cpp +++ b/source/duke3d/src/player.cpp @@ -2885,6 +2885,8 @@ void P_GetInput(int playerNum) return; } + CONTROL_ProcessBinds(); + if (ud.mouseaiming) g_myAimMode = BUTTON(gamefunc_Mouse_Aiming); else