From 42910ab2fd6e34031ff9caabdb5298c0526c1552 Mon Sep 17 00:00:00 2001 From: Irastris Date: Thu, 2 Jul 2026 02:13:22 -0400 Subject: [PATCH] Restore simultaneous gyro and joystick input for first person aiming (#2164) --- src/d/actor/d_a_alink_link.inc | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/d/actor/d_a_alink_link.inc b/src/d/actor/d_a_alink_link.inc index b5dcfe06e6..6150fe09d2 100644 --- a/src/d/actor/d_a_alink_link.inc +++ b/src/d/actor/d_a_alink_link.inc @@ -122,18 +122,11 @@ BOOL daAlink_c::setBodyAngleToCamera() { var_f31 /= dComIfGp_getCameraZoomScale(field_0x317c); } -#if TARGET_PC - if (dusk::getSettings().game.enableMouseAim && checkAimInputContext()) { - sp8 = mBodyAngle.x; - } else -#endif - { - shape_angle.y = shape_angle.y + (var_f31 * cM_ssin(mStickAngle) IF_DUSK(* (dusk::getSettings().game.invertFirstPersonXAxis ? -1.0f : 1.0f))); - sp8 = mBodyAngle.x + (var_f31 * cM_scos(mStickAngle) IF_DUSK(* (dusk::getSettings().game.invertFirstPersonYAxis ? -1.0f : 1.0f))); + shape_angle.y = shape_angle.y + (var_f31 * cM_ssin(mStickAngle) IF_DUSK(* (dusk::getSettings().game.invertFirstPersonXAxis ? -1.0f : 1.0f))); + sp8 = mBodyAngle.x + (var_f31 * cM_scos(mStickAngle) IF_DUSK(* (dusk::getSettings().game.invertFirstPersonYAxis ? -1.0f : 1.0f))); - if (checkNotItemSinkLimit() && sp8 > 0 && sp8 > mBodyAngle.x) { - sp8 = mBodyAngle.x; - } + if (checkNotItemSinkLimit() && sp8 > 0 && sp8 > mBodyAngle.x) { + sp8 = mBodyAngle.x; } } else { sp8 = mBodyAngle.x;