From e144406c169cb8dd2fb95640e02a7239765979c0 Mon Sep 17 00:00:00 2001 From: Tyler Wilding Date: Sat, 19 Oct 2024 15:16:40 -0400 Subject: [PATCH] g/j2: make the turret controls respect the camera settings (#3715) Fixes #3664 --- goal_src/jak2/engine/target/target-turret.gc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/goal_src/jak2/engine/target/target-turret.gc b/goal_src/jak2/engine/target/target-turret.gc index ac3aa17b768..aed7aac37ed 100644 --- 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-vertical-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)))