From 7145890eee9cd94673b89e42cecc339c14bb0406 Mon Sep 17 00:00:00 2001 From: Hat Kid <6624576+Hat-Kid@users.noreply.github.com> Date: Tue, 14 Apr 2026 07:26:44 +0200 Subject: [PATCH] jak3: high fps fix for mech carry drop (#4223) Closes #4205 --- goal_src/jak3/engine/target/logic-target.gc | 3 ++- goal_src/jak3/engine/target/mech/mech-states.gc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/goal_src/jak3/engine/target/logic-target.gc b/goal_src/jak3/engine/target/logic-target.gc index 750e1532d1..6bf9352643 100644 --- a/goal_src/jak3/engine/target/logic-target.gc +++ b/goal_src/jak3/engine/target/logic-target.gc @@ -1766,7 +1766,8 @@ (vector-! v1-190 a1-44 (vector-float*! v1-190 (-> self control dynam gravity-normal) f0-13)) (let* ((f1-8 (vector-length v1-190)) (f2-1 f1-8) - (f0-14 (+ 512.0 f0-13)) + ;; og:preserve-this high fps fix + (f0-14 (+ (* 512.0 DISPLAY_FPS_RATIO) f0-13)) ) (vector+! a1-44 diff --git a/goal_src/jak3/engine/target/mech/mech-states.gc b/goal_src/jak3/engine/target/mech/mech-states.gc index 47b9c52321..500668572e 100644 --- a/goal_src/jak3/engine/target/mech/mech-states.gc +++ b/goal_src/jak3/engine/target/mech/mech-states.gc @@ -1636,7 +1636,8 @@ ) ) (format 0 "frame: ~f~%" (ja-frame-num 0)) - (when (and (fill-and-probe-using-spheres *collide-cache* s5-6) (< 12.5 (ja-frame-num 0))) + ;; og:preserve-this high fps fix + (when (and (fill-and-probe-using-spheres *collide-cache* s5-6) (< 12.5 (* DISPLAY_FPS_RATIO (ja-frame-num 0)))) (sound-play "mech-setdown") (let ((v1-73 (the-as sound-rpc-set-param (get-sound-buffer-entry)))) (set! (-> v1-73 command) (sound-command set-param))