AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-22 11:22:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't use two-stage gamepad turn speed (#1524)

Browse Source
This commit is contained in:
ceski 2024-02-20 23:42:50 -08:00 committed by GitHub
parent 07206637eb
commit 81ebfeffaa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/g_game.c
View File

@ -427,14 +427,14 @@ static int CalcControllerSideStrafe(int speed)
return BETWEEN(-sidemove[speed], sidemove[speed], side); return BETWEEN(-sidemove[speed], sidemove[speed], side);
} }
static double CalcControllerAngle(int speed) static double CalcControllerAngle(void)
{ {
return (angleturn[speed] * axes[AXIS_TURN] * direction[joy_invert_turn]); return (angleturn[1] * axes[AXIS_TURN] * direction[joy_invert_turn]);
} }
static double CalcControllerPitch(int speed) static double CalcControllerPitch(void)
{ {
const double pitch = angleturn[speed] * axes[AXIS_LOOK]; const double pitch = angleturn[1] * axes[AXIS_LOOK];
return (pitch * FRACUNIT * direction[joy_invert_look]); return (pitch * FRACUNIT * direction[joy_invert_look]);
} }
@ -531,14 +531,12 @@ void G_PrepTiccmd(void)
if (I_UseController()) if (I_UseController())
{ {
const int speed = autorun ^ M_InputGameActive(input_speed);
I_CalcControllerAxes(); I_CalcControllerAxes();
D_UpdateDeltaTics(); D_UpdateDeltaTics();
if (axes[AXIS_TURN] && !strafe) if (axes[AXIS_TURN] && !strafe)
{ {
localview.rawangle -= CalcControllerAngle(speed) * deltatics; localview.rawangle -= CalcControllerAngle() * deltatics;
cmd->angleturn = CarryAngle(localview.rawangle); cmd->angleturn = CarryAngle(localview.rawangle);
localview.angle = cmd->angleturn << 16; localview.angle = cmd->angleturn << 16;
axes[AXIS_TURN] = 0.0f; axes[AXIS_TURN] = 0.0f;
@ -546,7 +544,7 @@ void G_PrepTiccmd(void)
if (axes[AXIS_LOOK] && padlook) if (axes[AXIS_LOOK] && padlook)
{ {
localview.rawpitch -= CalcControllerPitch(speed) * deltatics; localview.rawpitch -= CalcControllerPitch() * deltatics;
cmd->pitch = CarryPitch(localview.rawpitch); cmd->pitch = CarryPitch(localview.rawpitch);
localview.pitch = cmd->pitch; localview.pitch = cmd->pitch;
axes[AXIS_LOOK] = 0.0f; axes[AXIS_LOOK] = 0.0f;