From bce6349b1d09e24fd6a4deada395bc628452d38f Mon Sep 17 00:00:00 2001
From: Zwip-Zwap Zapony <ZwipZwapZapony@gmail.com>
Date: Wed, 4 Mar 2020 21:44:57 +0100
Subject: [PATCH] More gamepad deadzone tweakage
---
src/g_game.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/g_game.c b/src/g_game.c
index 2cddaf8b81..818cb38c24 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1044,20 +1044,17 @@ static INT32 G_BasicDeadZoneCalculation(INT32 magnitude, fixed_t deadZone)
{
const INT32 jdeadzone = (JOYAXISRANGE * deadZone) / FRACUNIT;
INT32 deadzoneAppliedValue = 0;
+ INT32 adjustedMagnitude = abs(magnitude);
- if (jdeadzone > 0 && magnitude > jdeadzone)
+ if (jdeadzone >= JOYAXISRANGE && adjustedMagnitude >= JOYAXISRANGE) // If the deadzone and magnitude are both 100%...
+ return JOYAXISRANGE; // ...return 100% input directly, to avoid dividing by 0
+ else if (adjustedMagnitude > jdeadzone) // Otherwise, calculate how much the magnitude exceeds the deadzone
{
- if (deadZone >= FRACUNIT) // If the deadzone value is at 100%...
- return JOYAXISRANGE; // ...return 100% input directly, to avoid dividing by 0
- else
- {
- INT32 adjustedMagnitude = abs(magnitude);
- adjustedMagnitude = min(adjustedMagnitude, JOYAXISRANGE);
+ adjustedMagnitude = min(adjustedMagnitude, JOYAXISRANGE);
- adjustedMagnitude -= jdeadzone;
+ adjustedMagnitude -= jdeadzone;
- deadzoneAppliedValue = (adjustedMagnitude * JOYAXISRANGE) / (JOYAXISRANGE - jdeadzone);
- }
+ deadzoneAppliedValue = (adjustedMagnitude * JOYAXISRANGE) / (JOYAXISRANGE - jdeadzone);
}
return deadzoneAppliedValue;
--
GitLab