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

fix float->int cast suppression + minor cleanup of a couple files (#1375)

Browse Source 
* fix float->int cast suppression + minor cleanup of a couple files

* add missing cutscenes
This commit is contained in:
ManDude
2022-05-28 20:23:39 +01:00
committed by GitHub
parent 148f52876a
commit c1faeac042
8 changed files with 86 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
goal_src/engine/game/task/task-control.gc
+21 -21
View File
@@ -335,7 +335,7 @@
(set! (-> a1-2 message) 'query)
(set! (-> a1-2 param 0) (the-as uint 'pickup))
(set! (-> a1-2 param 1) (the-as uint 6))
(>= (the int (send-event-function *target* a1-2)) (+ (get-reminder arg0 1) 3))
(>= (the int (the float (send-event-function *target* a1-2))) (+ (get-reminder arg0 1) 3))
)
)
)
@@ -357,7 +357,7 @@
(set! (-> a1-2 message) 'query)
(set! (-> a1-2 param 0) (the-as uint 'pickup))
(set! (-> a1-2 param 1) (the-as uint 6))
(>= (the int (send-event-function *target* a1-2)) (+ (get-reminder arg0 1) 3))
(>= (the int (the float (send-event-function *target* a1-2))) (+ (get-reminder arg0 1) 3))
)
)
)
@@ -474,7 +474,7 @@
(set! (-> a1-0 message) 'query)
(set! (-> a1-0 param 0) (the-as uint 'pickup))
(set! (-> a1-0 param 1) (the-as uint 6))
(>= (the int (send-event-function *target* a1-0)) 45)
(>= (the int (the float (send-event-function *target* a1-0))) 45)
)
)
)
@@ -511,7 +511,7 @@
(set! (-> a1-4 message) 'query)
(set! (-> a1-4 param 0) (the-as uint 'pickup))
(set! (-> a1-4 param 1) (the-as uint 6))
(>= (the int (send-event-function *target* a1-4)) (+ (get-reminder arg0 1) 3))
(>= (the int (the float (send-event-function *target* a1-4))) (+ (get-reminder arg0 1) 3))
)
)
)
@@ -536,7 +536,7 @@
(set! (-> a1-4 message) 'query)
(set! (-> a1-4 param 0) (the-as uint 'pickup))
(set! (-> a1-4 param 1) (the-as uint 6))
(>= (the int (send-event-function *target* a1-4)) (+ (get-reminder arg0 1) 3))
(>= (the int (the float (send-event-function *target* a1-4))) (+ (get-reminder arg0 1) 3))
)
)
)
@@ -561,7 +561,7 @@
(set! (-> a1-4 message) 'query)
(set! (-> a1-4 param 0) (the-as uint 'pickup))
(set! (-> a1-4 param 1) (the-as uint 6))
(>= (the int (send-event-function *target* a1-4)) (+ (get-reminder arg0 1) 3))
(>= (the int (the float (send-event-function *target* a1-4))) (+ (get-reminder arg0 1) 3))
)
)
)
@@ -573,7 +573,7 @@
(set! (-> a1-8 message) 'query)
(set! (-> a1-8 param 0) (the-as uint 'pickup))
(set! (-> a1-8 param 1) (the-as uint 6))
(>= (the int (send-event-function *target* a1-8)) (+ (get-reminder arg0 1) 3))
(>= (the int (the float (send-event-function *target* a1-8))) (+ (get-reminder arg0 1) 3))
)
)
)
@@ -598,7 +598,7 @@
(set! (-> a1-4 message) 'query)
(set! (-> a1-4 param 0) (the-as uint 'pickup))
(set! (-> a1-4 param 1) (the-as uint 6))
(>= (the int (send-event-function *target* a1-4)) (+ (get-reminder arg0 1) 3))
(>= (the int (the float (send-event-function *target* a1-4))) (+ (get-reminder arg0 1) 3))
)
)
)
@@ -610,7 +610,7 @@
(set! (-> a1-8 message) 'query)
(set! (-> a1-8 param 0) (the-as uint 'pickup))
(set! (-> a1-8 param 1) (the-as uint 6))
(>= (the int (send-event-function *target* a1-8)) (+ (get-reminder arg0 1) 3))
(>= (the int (the float (send-event-function *target* a1-8))) (+ (get-reminder arg0 1) 3))
)
)
)
@@ -1106,7 +1106,7 @@
(set! (-> a1-3 message) 'query)
(set! (-> a1-3 param 0) (the-as uint 'pickup))
(set! (-> a1-3 param 1) (the-as uint 6))
(>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3))
(>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3))
)
)
)
@@ -1129,7 +1129,7 @@
(set! (-> a1-3 message) 'query)
(set! (-> a1-3 param 0) (the-as uint 'pickup))
(set! (-> a1-3 param 1) (the-as uint 6))
(>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3))
(>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3))
)
)
)
@@ -1229,7 +1229,7 @@
(set! (-> a1-3 message) 'query)
(set! (-> a1-3 param 0) (the-as uint 'pickup))
(set! (-> a1-3 param 1) (the-as uint 6))
(>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3))
(>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3))
)
)
)
@@ -1252,7 +1252,7 @@
(set! (-> a1-3 message) 'query)
(set! (-> a1-3 param 0) (the-as uint 'pickup))
(set! (-> a1-3 param 1) (the-as uint 6))
(>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3))
(>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3))
)
)
)
@@ -1840,7 +1840,7 @@
(set! (-> a1-3 message) 'query)
(set! (-> a1-3 param 0) (the-as uint 'pickup))
(set! (-> a1-3 param 1) (the-as uint 6))
(>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3))
(>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3))
)
)
)
@@ -1863,7 +1863,7 @@
(set! (-> a1-3 message) 'query)
(set! (-> a1-3 param 0) (the-as uint 'pickup))
(set! (-> a1-3 param 1) (the-as uint 6))
(>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3))
(>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3))
)
)
)
@@ -1886,7 +1886,7 @@
(set! (-> a1-3 message) 'query)
(set! (-> a1-3 param 0) (the-as uint 'pickup))
(set! (-> a1-3 param 1) (the-as uint 6))
(>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3))
(>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3))
)
)
)
@@ -1909,7 +1909,7 @@
(set! (-> a1-3 message) 'query)
(set! (-> a1-3 param 0) (the-as uint 'pickup))
(set! (-> a1-3 param 1) (the-as uint 6))
(>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3))
(>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3))
)
)
)
@@ -2107,7 +2107,7 @@
(set! (-> a1-3 message) 'query)
(set! (-> a1-3 param 0) (the-as uint 'pickup))
(set! (-> a1-3 param 1) (the-as uint 6))
(>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3))
(>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3))
)
)
)
@@ -2130,7 +2130,7 @@
(set! (-> a1-3 message) 'query)
(set! (-> a1-3 param 0) (the-as uint 'pickup))
(set! (-> a1-3 param 1) (the-as uint 6))
(>= (the int (send-event-function *target* a1-3)) (+ (get-reminder arg0 1) 3))
(>= (the int (the float (send-event-function *target* a1-3))) (+ (get-reminder arg0 1) 3))
)
)
)
@@ -5115,7 +5115,7 @@
(set! (-> a1-0 message) 'query)
(set! (-> a1-0 param 0) (the-as uint 'pickup))
(set! (-> a1-0 param 1) (the-as uint 6))
(>= (the int (send-event-function *target* a1-0)) 20)
(>= (the int (the float (send-event-function *target* a1-0))) 20)
)
)
)
@@ -5228,7 +5228,7 @@
(set! (-> a1-0 message) 'query)
(set! (-> a1-0 param 0) (the-as uint 'pickup))
(set! (-> a1-0 param 1) (the-as uint 6))
(>= (the int (send-event-function *target* a1-0)) 72)
(>= (the int (the float (send-event-function *target* a1-0))) 72)
)
)
)
goal_src/engine/ps2/pad.gc
+20 -28
View File
@@ -202,47 +202,39 @@
(defmacro analog-input-horizontal-first (in offset center-val max-val out-range)
"Same as analog-input but respects First-Person Horizontal camera control setting."
`(#if PC_PORT
(*
(if (-> *pc-settings* first-camera-h-inverted?) -1.0 1.0) ;; first-person horizontal is NOT inverted in original game
(analog-input ,in ,offset ,center-val ,max-val ,out-range)
)
(analog-input ,in ,offset ,center-val ,max-val ,out-range)
`(#if PC_PORT ;; first-person horizontal is NOT inverted in original game
(* (if (-> *pc-settings* first-camera-h-inverted?) -1.0 1.0)
(analog-input ,in ,offset ,center-val ,max-val ,out-range))
(analog-input ,in ,offset ,center-val ,max-val ,out-range)
)
)
)
(defmacro analog-input-vertical-first (in offset center-val max-val out-range)
"Same as analog-input but respects First-Person Vertical camera control setting."
`(#if PC_PORT
(*
(if (-> *pc-settings* first-camera-v-inverted?) 1.0 -1.0) ;; first-person vertical is already inverted in original game
(analog-input ,in ,offset ,center-val ,max-val ,out-range)
)
(analog-input ,in ,offset ,center-val ,max-val ,out-range)
`(#if PC_PORT ;; first-person vertical is already inverted in original game
(* (if (-> *pc-settings* first-camera-v-inverted?) 1.0 -1.0)
(analog-input ,in ,offset ,center-val ,max-val ,out-range))
(analog-input ,in ,offset ,center-val ,max-val ,out-range)
)
)
)
(defmacro analog-input-horizontal-third (in offset center-val max-val out-range)
"Same as analog-input but respects Third-Person Horizontal camera control setting."
`(#if PC_PORT
(*
(if (-> *pc-settings* third-camera-h-inverted?) 1.0 -1.0) ;; third-person horizontal is already inverted in original game
(analog-input ,in ,offset ,center-val ,max-val ,out-range)
)
(analog-input ,in ,offset ,center-val ,max-val ,out-range)
`(#if PC_PORT ;; third-person horizontal is already inverted in original game
(* (if (-> *pc-settings* third-camera-h-inverted?) 1.0 -1.0)
(analog-input ,in ,offset ,center-val ,max-val ,out-range))
(analog-input ,in ,offset ,center-val ,max-val ,out-range)
)
)
)
(defmacro analog-input-vertical-third (in offset center-val max-val out-range)
"Same as analog-input but respects Third-Person Vertical camera control setting."
`(#if PC_PORT
(*
(if (-> *pc-settings* third-camera-v-inverted?) 1.0 -1.0) ;; third-person vertical is already inverted in original game
(analog-input ,in ,offset ,center-val ,max-val ,out-range)
)
(analog-input ,in ,offset ,center-val ,max-val ,out-range)
`(#if PC_PORT ;; third-person vertical is already inverted in original game
(* (if (-> *pc-settings* third-camera-v-inverted?) 1.0 -1.0)
(analog-input ,in ,offset ,center-val ,max-val ,out-range))
(analog-input ,in ,offset ,center-val ,max-val ,out-range)
)
)
)
(defun cpad-set-buzz! ((pad cpad-info) (buzz-idx int) (buzz-amount int) (duration time-frame))
"Turn on vibration motor 'buzz-idx' for duration, at magnitude buzz-amount."