From 38b32d9063f1f1d37863aa2cd0df4dbd2c46433b Mon Sep 17 00:00:00 2001 From: SaracenOne Date: Wed, 19 Jan 2022 13:06:22 +0000 Subject: [PATCH] Fix tracking of targets on right tangent and restoring Lara's (#392) torso and head rotations once target has been lost --- src/fixed/lara.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fixed/lara.h b/src/fixed/lara.h index ee305e1..6513327 100644 --- a/src/fixed/lara.h +++ b/src/fixed/lara.h @@ -2812,7 +2812,7 @@ struct Lara : ItemObj if (R.aim && L.aim) { H.x = T.x = aX >> 2; H.y = T.y = aY >> 2; - } else if (R.aim ^ L.aim) { + } else { H.x = T.x = aX >> 1; H.y = T.y = aY >> 1; } @@ -3636,7 +3636,7 @@ struct Lara : ItemObj extraL->armR.aim = extraL->armL.aim = true; } else { extraL->armR.aim = extraL->armR.aim && (abs(angleAim.x) <= params.armX) && (angleAim.y >= params.armMinY) && (angleAim.y <= params.armMaxY); - extraL->armL.aim = extraL->armR.aim && (abs(angleAim.x) <= params.armX) && (angleAim.y >= -params.armMaxY) && (angleAim.y <= -params.armMinY); + extraL->armL.aim = extraL->armL.aim && (abs(angleAim.x) <= params.armX) && (angleAim.y >= -params.armMaxY) && (angleAim.y <= -params.armMinY); } } else { extraL->armR.aim = extraL->armL.aim = false;