mirror
/
jak-project
mirror of https://github.com/open-goal/jak-project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[jak3] fix soundless spools always assuming 60fps + [jak2] fix rogue entity error spam on ctywide kill (#4038)

This commit is contained in:
Alex 2025-10-06 23:46:08 +01:00 committed by GitHub
parent 2cd64522c4
commit 701624bbf5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
goal_src/jak2/engine/level/level-info.gc
View File

@ -5654,7 +5654,7 @@
:login-func #f
:activate-func 'lwide-activate
:deactivate-func 'lwide-deactivate
:kill-func #f
:kill-func 'lwide-kill ;; og:preserve-this required to suppress rogue entity errors
:borrow-level (new 'static 'array symbol 2 #f #f)
:borrow-display? (new 'static 'array symbol 2 #f #f)
:texture-anim-tfrag #f
@ -5710,7 +5710,7 @@
:login-func #f
:activate-func 'lwide-activate
:deactivate-func 'lwide-deactivate
:kill-func #f
:kill-func 'lwide-kill ;; og:preserve-this required to suppress rogue entity errors
:borrow-level (new 'static 'array symbol 2 #f #f)
:borrow-display? (new 'static 'array symbol 2 #f #f)
:texture-anim-tfrag #f
@ -5766,7 +5766,7 @@
:login-func #f
:activate-func 'lwide-activate
:deactivate-func 'lwide-deactivate
:kill-func #f
:kill-func 'lwide-kill ;; og:preserve-this required to suppress rogue entity errors
:borrow-level (new 'static 'array symbol 2 #f #f)
:borrow-display? (new 'static 'array symbol 2 #f #f)
:texture-anim-tfrag #f

7
goal_src/jak2/levels/city/traffic/traffic-manager.gc
View File

@ -899,6 +899,13 @@
(none)
)
;; og:preserve-this required to suppress rogue entity errors
(defun lwide-kill ()
(format #t "lwide-kill~%")
(send-event *traffic-manager* 'kill-all)
(none)
)
(defun ctywide-entity-hack ()
(with-pp
(cond

4
goal_src/jak3/engine/gfx/hw/video.gc
View File

@ -27,6 +27,10 @@
(set! *video-mode* 1)
(sound-set-fps 50)
)
;; og:preserve-this added custom case
(('custom)
(sound-set-fps (-> *pc-settings* target-fps))
)
)
(set-time-ratios *display* (-> *display* dog-ratio))
(set! (-> *video-params* reset-video-mode) #t)