Skip to content

Commit

Permalink
regressions
Browse files Browse the repository at this point in the history
  • Loading branch information
Hat-Kid committed Dec 7, 2024
1 parent 100b706 commit 627caa8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 1 addition & 3 deletions goal_src/jak1/levels/rolling/rolling-robber.gc
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -85,7 +84,6 @@
robber-initial-notice
robber-tired))


(defskelgroup *robber-sg*
robber
robber-lod0-jg
Expand Down
1 change: 1 addition & 0 deletions goal_src/jak3/engine/target/gun/gun-blue-shot.gc
Original file line number Diff line number Diff line change
Expand Up @@ -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?))
)
Expand Down
3 changes: 2 additions & 1 deletion goal_src/jak3/engine/ui/progress/progress.gc
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 627caa8

Please sign in to comment.