From 44193caef012691573b04661e282b759cd6f646b Mon Sep 17 00:00:00 2001
From: ManDude <7569514+ManDude@users.noreply.github.com>
Date: Sun, 30 Apr 2023 01:23:53 +0100
Subject: [PATCH] [jak2] more specific cutscene detection (#2590)

Fixes some instances of the camera entering cutscene mode when we don't
want that.
---
 goal_src/jak1/engine/game/game-h.gc | 12 ++++++------
 goal_src/jak2/pc/pckernel.gc        |  9 +++++++++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/goal_src/jak1/engine/game/game-h.gc b/goal_src/jak1/engine/game/game-h.gc
index 5500bcaace..8c14a85ac2 100644
--- a/goal_src/jak1/engine/game/game-h.gc
+++ b/goal_src/jak1/engine/game/game-h.gc
@@ -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))
diff --git a/goal_src/jak2/pc/pckernel.gc b/goal_src/jak2/pc/pckernel.gc
index fd2eba6283..9383da39d9 100644
--- a/goal_src/jak2/pc/pckernel.gc
+++ b/goal_src/jak2/pc/pckernel.gc
@@ -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"