From 99c1a5177279410ebcb6900843ec8aa5270283ac Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Thu, 15 Dec 2022 21:21:43 +0000
Subject: [PATCH] Fix gamepad axis brake behaviour
- It was actually ACCELERATION axis input that was predominantly broken!
- It was inexplicably slightly under double what it should be (98 instead of the digital value of 50), which meant brake analog input struggled to dampen it.
- Analog brake deceleration also gets a slight buff, from 24 to 25 (previously off from the digital value of 25 due to integer division rounding)
- Remove a pointless, always-true condition for brake handling.
- Checked whether accel was held down OR whether `cmd->forwardmove` was less than or equal 0...
- But further up the same function, `cmd` was invariably overwritten with a blank `I_BaseTiccmd`!
- Therefore, `cmd->forwardmove` would always equal 0, and the `forwardmove` subtraction would always occur.
---
src/g_game.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/g_game.c b/src/g_game.c
index c6b633cee..484d65113 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1503,22 +1503,20 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
{
cmd->buttons |= BT_ACCELERATE;
// JOYAXISRANGE is supposed to be 1023 (divide by 1024)
- forward += ((axis * forwardmove[1]) >> 10)*2;
+ forward += ((axis * forwardmove[1]) / (JOYAXISRANGE-1));
}
axis = JoyAxis(AXISBRAKE, ssplayer);
if (InputDown(gc_brake, ssplayer) || (gamepadjoystickmove && axis > 0))
{
cmd->buttons |= BT_BRAKE;
- if (cmd->buttons & BT_ACCELERATE || cmd->forwardmove <= 0)
- forward -= forwardmove[0]; // 25 - Halved value so clutching is possible
+ forward -= forwardmove[0]; // 25 - Halved value so clutching is possible
}
else if (analogjoystickmove && axis > 0)
{
cmd->buttons |= BT_BRAKE;
// JOYAXISRANGE is supposed to be 1023 (divide by 1024)
- if (cmd->buttons & BT_ACCELERATE || cmd->forwardmove <= 0)
- forward -= ((axis * forwardmove[0]) >> 10);
+ forward -= ((axis * forwardmove[0]) / (JOYAXISRANGE-1));
}
// But forward/backward IS used for aiming.
--
GitLab