incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix disabled analog steering and aiming at 0 input deadzone

Browse source
This commit is contained in:
Antoine De Grandpré 2026-03-03 09:08:07 -05:00 committed by NepDisk
parent 4ec7c0953d
commit ebc63dca42
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/g_game.c
View file

@ -1290,7 +1290,7 @@ retrygetcontrol:
value = gamekeydown[deviceID][key];
if (value >= deadzone)
if (value > deadzone)
{
return value;
}
@ -1451,15 +1451,29 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
return;
}
fixed_t deadZoneY = cv_deadzoney[forplayer].value;
const double deadZoneYDecimal = (double) deadZoneY / FRACUNIT;
joystickvector.xaxis = G_PlayerInputAnalog(forplayer, gc_turnright, false, DEADZONE_X) - G_PlayerInputAnalog(forplayer, gc_turnleft, false, DEADZONE_X);
joystickvector.yaxis = 0;
if (deadZoneYDecimal <= 0)
{
joystickvector.yaxis = G_PlayerInputAnalog(forplayer, gc_aimbackward, false, DEADZONE_Y) - G_PlayerInputAnalog(forplayer, gc_aimforward, false, DEADZONE_Y);
}
else
{
joystickvector.yaxis = 0;
}
G_HandleAxisDeadZone(forplayer, &joystickvector);
// For kart, I've turned the aim axis into a digital axis because we only
// use it for aiming to throw items forward/backward and the vote screen
// This mean that the turn axis will still be gradient but up/down will be 0
// until the stick is pushed far enough
joystickvector.yaxis = G_PlayerInputAnalog(forplayer, gc_aimbackward, false, DEADZONE_Y) - G_PlayerInputAnalog(forplayer, gc_aimforward, false, DEADZONE_Y);
//
// When the deadzone is set to 0 or lower, the aim axis returns to analog to avoid breaking the chasecam and freecam controls
if (deadZoneYDecimal > 0)
{
joystickvector.yaxis = G_PlayerInputAnalog(forplayer, gc_aimbackward, false, DEADZONE_Y) - G_PlayerInputAnalog(forplayer, gc_aimforward, false, DEADZONE_Y);
}
if (encoremode)
{