From de97c41532becc25367f2c33130c0783fc42fca8 Mon Sep 17 00:00:00 2001 From: toaster Date: Fri, 26 Aug 2022 21:18:27 +0100 Subject: [PATCH] Revert "Remove game deadzone for Accel/Brake" This reverts commit 44eeb3a0f380f81a6e61d01eda2762160ff1ec4d. # Conflicts: # src/m_menu.c --- src/g_game.h | 4 ++-- src/m_menu.c | 20 +++++++++++++------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/g_game.h b/src/g_game.h index ead5b7ae4..9f1b8c5cf 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -128,11 +128,11 @@ typedef enum { AXISNONE = 0, AXISTURN, + AXISMOVE, + AXISBRAKE, AXISAIM, AXISLOOK, AXISDEAD, //Axises that don't want deadzones - AXISMOVE, - AXISBRAKE, AXISFIRE, AXISDRIFT, AXISLOOKBACK, diff --git a/src/m_menu.c b/src/m_menu.c index 1dbe458e2..ee8541134 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -2627,21 +2627,27 @@ boolean M_Responder(event_t *ev) accelaxis /= 2; if (ev->data1 == accelaxis) { + const INT32 jacceldeadzone = xmode ? jxdeadzone : jydeadzone; retaxis = xmode ? ev->data2 : ev->data3; if (retaxis != INT32_MAX) { if (cv_moveaxis.value < 0) retaxis = -retaxis; - if (joywaitaccel < thistime && retaxis >= pjoyaccel) // only on upwards event + if (Joystick.bGamepadStyle || retaxis > jacceldeadzone) { - ch = KEY_ENTER; - joywaitaccel = thistime; - if (pjoyaccel == 0 // no previous input? - || ((retaxis < 0) == (pjoyaccel < 0))) // same direction as the current one? - joywaitaccel += NEWTICRATE/3; + if (joywaitaccel < thistime) + { + ch = KEY_ENTER; + joywaitaccel = thistime; + if (pjoyaccel == 0 // no previous input? + || ((retaxis < 0) == (pjoyaccel > 0))) // same direction as the current one? + joywaitaccel += NEWTICRATE/3; + } + pjoyaccel = retaxis; } - pjoyaccel = retaxis; + else + pjoyaccel = 0; } } }