From 1c95ddacb8a2ced158775d87dc1f511a9663e5eb Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 7 Mar 2017 10:26:03 +0100 Subject: [PATCH] Revert "Moved some ancient playsim mouse input code around so that it works properly with input events" This reverts commit 2e0eb742ebe4d090f266cd5900a461c3d16a929e. This effectively nullifies the attempt to get a higher mouse update rate for the display. --- src/d_main.cpp | 53 ++++++++++++++++++++------------------------------ 1 file changed, 21 insertions(+), 32 deletions(-) diff --git a/src/d_main.cpp b/src/d_main.cpp index ac423d10b5..77e0edda04 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -258,35 +258,6 @@ static int pagetic; // //========================================================================== -// [ZZ] this handles the mouse changes in the playsim. -// I have no idea why it had to be done before events are dispatched... also no idea why is this not in G_Responder or something. -static bool D_ProcessMouseForPlaysim(event_t *ev) -{ - //if (ev->type == EV_Mouse && !paused && menuactive == MENU_Off && ConsoleState != c_down && ConsoleState != c_falling && !E_CheckUiProcessors()) - if (ev->type == EV_Mouse && !paused) // [ZZ] the other checks are replaced with responders eating the event. - { - if (Button_Mlook.bDown || freelook) - { - int look = int(ev->y * m_pitch * mouse_sensitivity * 16.0); - if (invertmouse) - look = -look; - G_AddViewPitch(look); - events[eventhead].y = 0; - } - if (!Button_Strafe.bDown && !lookstrafe) - { - G_AddViewAngle(int(ev->x * m_yaw * mouse_sensitivity * 8.0)); - events[eventhead].x = 0; - } - if ((events[eventhead].x | events[eventhead].y) == 0) - { - return false; - } - } - - return true; -} - void D_ProcessEvents (void) { event_t *ev; @@ -319,9 +290,7 @@ void D_ProcessEvents (void) // check events if (E_Responder(ev)) // [ZZ] ZScript ate the event continue; - // before passing this further, do some magic - if (D_ProcessMouseForPlaysim(ev)) - G_Responder (ev); + G_Responder (ev); } } @@ -341,6 +310,26 @@ void D_PostEvent (const event_t *ev) return; } events[eventhead] = *ev; + if (ev->type == EV_Mouse && !paused && menuactive == MENU_Off && ConsoleState != c_down && ConsoleState != c_falling && !E_CheckUiProcessors()) + { + if (Button_Mlook.bDown || freelook) + { + int look = int(ev->y * m_pitch * mouse_sensitivity * 16.0); + if (invertmouse) + look = -look; + G_AddViewPitch (look); + events[eventhead].y = 0; + } + if (!Button_Strafe.bDown && !lookstrafe) + { + G_AddViewAngle (int(ev->x * m_yaw * mouse_sensitivity * 8.0)); + events[eventhead].x = 0; + } + if ((events[eventhead].x | events[eventhead].y) == 0) + { + return; + } + } eventhead = (eventhead+1)&(MAXEVENTS-1); }