mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-07-24 14:09:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

[jak2] more specific cutscene detection (#2590)

Browse Source 
Fixes some instances of the camera entering cutscene mode when we don't
want that.
This commit is contained in:
ManDude
2023-04-30 01:23:53 +01:00
committed by GitHub
parent bc30e00b2f
commit 44193caef0
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
goal_src/jak1/engine/game/game-h.gc
+6 -6
View File
@@ -51,12 +51,12 @@
(let ((mask-actual mask)
(arg (car args))
)
(when (not (assoc 'shove-up arg)) (cons! mask-actual 'shove-up))
(when (not (assoc 'shove-back arg)) (cons! mask-actual 'shove-back))
(when (not (assoc 'mode arg)) (cons! mask-actual 'mode))
(when (not (assoc 'vector arg)) (cons! mask-actual 'vector))
(when (not (assoc 'angle arg)) (cons! mask-actual 'angle))
(when (not (assoc 'control arg)) (cons! mask-actual 'control))
(when (assoc 'shove-up arg) (cons! mask-actual 'shove-up))
(when (assoc 'shove-back arg) (cons! mask-actual 'shove-back))
(when (assoc 'mode arg) (cons! mask-actual 'mode))
(when (assoc 'vector arg) (cons! mask-actual 'vector))
(when (assoc 'angle arg) (cons! mask-actual 'angle))
(when (assoc 'control arg) (cons! mask-actual 'control))
`(let ((atk (new 'static 'attack-info :mask (attack-mask ,@mask-actual))))
,@(apply (lambda (x) (if (eq? (car x) 'vector)
`(vector-copy! (-> atk ,(car x)) ,(cadr x))
goal_src/jak2/pc/pckernel.gc
+9
View File
@@ -51,6 +51,15 @@
(get-current-language)
)
(defmethod update pc-settings-jak2 ((obj pc-settings-jak2))
"handle the text parsing input for the 'settings' group"
((method-of-type pc-settings update) obj)
(set! (-> obj movie?) (and (!= #f *scene-player*) (movie?)))
(none))
(defmethod update-discord-rpc pc-settings-jak2 ((obj pc-settings-jak2))
"update discord rpc module"