g/j2: make the turret controls respect the camera settings

open-goal · Oct 14, 2024 · 1b1a074 · 1b1a074
1 parent b50652c
commit 1b1a074
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/goal_src/jak2/engine/target/target-turret.gc b/goal_src/jak2/engine/target/target-turret.gc
@@ -1250,8 +1250,9 @@
         )
       )
     (when (and (-> self enable-controls) (>= (-> *camera-combiner* interp-val) 1.0))
-      (set! (-> self rotyvv) (analog-input (the-as int (-> *cpad-list* cpads 0 leftx)) 128.0 32.0 110.0 -98304.0))
-      (set! (-> self rotxvv) (analog-input (the-as int (-> *cpad-list* cpads 0 lefty)) 128.0 32.0 110.0 -65536.0))
+      ;; og:preserve-this respect the camera settings
+      (set! (-> self rotyvv) (analog-input-horizontal-first (the-as int (-> *cpad-list* cpads 0 leftx)) 128.0 32.0 110.0 -98304.0))
+      (set! (-> self rotxvv) (analog-input-horizontal-first (the-as int (-> *cpad-list* cpads 0 lefty)) 128.0 32.0 110.0 -65536.0))
       )
     (+! (-> self rotyv) (* (-> self rotyvv) (seconds-per-frame)))
     (seek! (-> self rotyv) 0.0 (* 32768.0 (seconds-per-frame)))