From 1181121729084c77fcf42832776f560f80427e6b Mon Sep 17 00:00:00 2001 From: helixhorned Date: Fri, 11 Oct 2013 13:43:39 +0000 Subject: [PATCH] Revert "Move CONTROL_ProcessBinds() to CONTROL_GetInput()." [r3981] That change confounded character-based input with e.g. HUD control under certain circumstances, see http://forums.duke4.net/topic/6845-eduke32-savegame-annoyances/ Also, BUILD_LUNATIC ... just for the hit.sect -> hit.sector change. git-svn-id: https://svn.eduke32.com/eduke32@4093 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/game.c | 2 +- polymer/eduke32/source/jmact/control.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index 77c2e8efb..618b16118 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -11835,7 +11835,7 @@ MAIN_LOOP_RESTART: { if (g_networkMode != NET_DEDICATED_SERVER) { -// CONTROL_ProcessBinds(); + CONTROL_ProcessBinds(); P_GetInput(myconnectindex); } diff --git a/polymer/eduke32/source/jmact/control.c b/polymer/eduke32/source/jmact/control.c index 55595c404..93f70c0f8 100644 --- a/polymer/eduke32/source/jmact/control.c +++ b/polymer/eduke32/source/jmact/control.c @@ -789,8 +789,8 @@ static void CONTROL_GetFunctionInput(void) void CONTROL_GetInput(ControlInfo *info) { CONTROL_PollDevices(info); + CONTROL_GetFunctionInput(); - CONTROL_ProcessBinds(); } int32_t CONTROL_Startup(controltype which, int32_t(*TimeFunction)(void), int32_t ticspersecond)