diff --git a/goal_src/jak1/levels/rolling/rolling-robber.gc b/goal_src/jak1/levels/rolling/rolling-robber.gc index 6cf3ccf649..bac5e00810 100644 --- a/goal_src/jak1/levels/rolling/rolling-robber.gc +++ b/goal_src/jak1/levels/rolling/rolling-robber.gc @@ -21,8 +21,7 @@ (set! (-> *camera-other-root* quad) (-> *math-camera* trans quad)) (set-time! (-> self state-time)) (loop - (dotimes (v1-14 (the int (-> *display* time-adjust-ratio))) - (set! arg2 (* 0.95 arg2))) + (*! arg2 (- 1.0 (* 0.05 (-> *display* time-adjust-ratio)))) ;; og:preserve-this changed for high fps (when (and (< (fabs arg2) 13.653334) (time-elapsed? (-> self state-time) (seconds 1.5))) (if *target* (process-release? *target*)) (go-virtual wait)) @@ -85,7 +84,6 @@ robber-initial-notice robber-tired)) - (defskelgroup *robber-sg* robber robber-lod0-jg diff --git a/goal_src/jak3/engine/target/gun/gun-blue-shot.gc b/goal_src/jak3/engine/target/gun/gun-blue-shot.gc index 1feba0cb7c..d7f2607bf4 100644 --- a/goal_src/jak3/engine/target/gun/gun-blue-shot.gc +++ b/goal_src/jak3/engine/target/gun/gun-blue-shot.gc @@ -494,6 +494,7 @@ (when (and (!= *target* s4-1) (!= sv-1300 s4-1) (not (focus-test? (the-as process-focusable s4-1) disable dead inactive gun-no-target)) + (pc-check-focus-fix (the-as process-focusable s4-1)) ;; og:preserve-this (or (logtest? (process-mask crate enemy vehicle civilian) (-> s4-1 mask)) (and (logtest? (process-mask guard) (-> s4-1 mask)) (-> *setting-control* user-current gun-target-guards?)) ) diff --git a/goal_src/jak3/engine/ui/progress/progress.gc b/goal_src/jak3/engine/ui/progress/progress.gc index 9308f84288..4fd910d4fb 100644 --- a/goal_src/jak3/engine/ui/progress/progress.gc +++ b/goal_src/jak3/engine/ui/progress/progress.gc @@ -1654,7 +1654,8 @@ (-> self current) ) ) - (case (-> self current) + ;; og:preserve-this patched to next instead of current because we save synchronously + (case (-> self next) (('saving) (cond ((= (-> self state-array 0) 'title)