From d01684467cee21e4419774030ace9453461d60a3 Mon Sep 17 00:00:00 2001 From: ceski <56656010+ceski-1@users.noreply.github.com> Date: Sun, 3 Mar 2024 08:41:42 -0800 Subject: [PATCH] Prevent turning on first tic of an SR50 (#1549) --- src/g_game.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index 9381211b..5d0ff301 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -615,10 +615,13 @@ void G_BuildTiccmd(ticcmd_t* cmd) if (strafe) { - if (turnright) - side += sidemove[speed]; - if (turnleft) - side -= sidemove[speed]; + if (!cmd->angleturn) + { + if (turnright) + side += sidemove[speed]; + if (turnleft) + side -= sidemove[speed]; + } } else { @@ -649,7 +652,7 @@ void G_BuildTiccmd(ticcmd_t* cmd) if (I_UseController()) { - if (axes[AXIS_TURN] && strafe) + if (axes[AXIS_TURN] && strafe && !cmd->angleturn) { side += CalcControllerSideTurn(speed); } @@ -667,7 +670,7 @@ void G_BuildTiccmd(ticcmd_t* cmd) // Mouse - if (mousex && strafe) + if (mousex && strafe && !cmd->angleturn) { const double mouseside = CalcMouseSide(mousex); side += CarryMouseSide(mouseside);