mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-08-21 23:00:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into j2/progress

Browse Source
This commit is contained in:
Tyler Wilding
2022-10-08 21:09:35 -04:00
parent eee41d1400 405a144815
commit 3f7df80a1c
475 changed files with 24842 additions and 5662 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/decompiler/reference/jak2/engine/game/task/task-control_REF.gc
Generated Vendored
+18 -18
View File
@@ -561,7 +561,7 @@
(let ((node (-> game-nodes i)))
(if (and (= (-> node level) (-> cur-lev info taskname))
(!= (-> node level) 'city)
(zero? (logand (game-task-node-flag no-restart) (-> node flags)))
(not (logtest? (game-task-node-flag no-restart) (-> node flags)))
(open? node)
)
(set! gp-1 (the-as int (-> node task)))
@@ -674,7 +674,7 @@
(dotimes (i (-> game-nodes length))
(when (nonzero? i)
(let ((node (-> game-nodes i)))
(when (and (zero? (logand (-> node flags) (game-task-node-flag closed)))
(when (and (not (logtest? (-> node flags) (game-task-node-flag closed)))
(begin
(dotimes (a3-3 4)
(when (and (nonzero? (-> node parent-node a3-3))
@@ -723,7 +723,7 @@
;; definition for method 9 of type game-task-node-info
(defmethod close! game-task-node-info ((obj game-task-node-info) (arg0 symbol))
(when (zero? (logand (-> obj flags) (game-task-node-flag closed)))
(when (not (logtest? (-> obj flags) (game-task-node-flag closed)))
(let ((task-node-close-func
(lambda ((arg0 game-task-node-info))
(with-pp
@@ -882,7 +882,7 @@
(let ((game-nodes (-> *game-info* sub-task-list))
(node-info obj)
)
(and (zero? (logand (-> node-info flags) (game-task-node-flag closed)))
(and (not (logtest? (-> node-info flags) (game-task-node-flag closed)))
(begin
(dotimes (pi 4)
(let ((t0-0 (-> node-info parent-node pi)))
@@ -1015,7 +1015,7 @@
)
(('try)
(if (and (not (task-complete? *game-info* (-> node task)))
(or (zero? (logand (-> node flags) (game-task-node-flag save-on-life save-on-try)))
(or (not (logtest? (-> node flags) (game-task-node-flag save-on-life save-on-try)))
(logtest? (-> node flags) (game-task-node-flag reset-on-try))
)
)
@@ -1467,7 +1467,7 @@
;; definition for method 16 of type fail-mission
(defmethod print-text fail-mission ((obj fail-mission))
(when (and (zero? (logand (-> obj flags) (fail-mission-flags famflags-6)))
(when (and (not (logtest? (-> obj flags) (fail-mission-flags famflags-6)))
(= (gui-control-method-17 *gui-control* (the-as sound-id (-> obj message-id))) (gui-action playing))
)
(let ((gp-0 (new
@@ -1529,8 +1529,8 @@
;; failed to figure out what this is:
(defstate idle (fail-mission)
:virtual #t
:event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block))
(case arg2
:event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block))
(case event-type
(('reset)
(cond
((logtest? (-> self flags) (fail-mission-flags famflags-1))
@@ -1545,7 +1545,7 @@
)
)
(('query)
(case (-> arg3 param 0)
(case (-> event param 0)
(('reset)
(logtest? (-> self flags) (fail-mission-flags famflags-1))
)
@@ -1612,8 +1612,8 @@
)
(logior! (-> self flags) (fail-mission-flags famflags-1))
(set! (-> self grabbed-time) (-> self clock frame-counter))
(when (zero? (logand (-> self flags) (fail-mission-flags famflags-3)))
(when (zero? (logand (-> self flags) (fail-mission-flags famflags-5)))
(when (not (logtest? (-> self flags) (fail-mission-flags famflags-3)))
(when (not (logtest? (-> self flags) (fail-mission-flags famflags-5)))
(while (< (- (-> self clock frame-counter) (-> self grabbed-time)) (seconds 1.5))
(let ((f30-0 (lerp-scale 0.0 1.0 (the float (- (-> self clock frame-counter) (-> self grabbed-time))) 0.0 450.0)))
(set-filter-color!
@@ -1705,14 +1705,14 @@
;; failed to figure out what this is:
(defstate resetting (fail-mission)
:virtual #t
:event (behavior ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block))
(let ((v1-0 arg2))
:event (behavior ((proc process) (arg1 int) (event-type symbol) (event event-message-block))
(let ((v1-0 event-type))
(the-as object (cond
((= v1-0 'reset)
#t
)
((= v1-0 'query)
(case (-> arg3 param 0)
(case (-> event param 0)
(('reset)
#t
)
@@ -1832,7 +1832,7 @@
(the-as (function gui-connection symbol) #f)
(the-as process #f)
)
(when (zero? (logand (-> arg0 flags) (fail-mission-flags famflags-4)))
(when (not (logtest? (-> arg0 flags) (fail-mission-flags famflags-4)))
(if (not (and *target* (logtest? (-> *target* focus-status) (focus-status dead)) (zero? (-> self message))))
(set! (-> self stinger)
(the-as
@@ -1847,7 +1847,7 @@
(set-setting! 'speech-control #f 0 0)
(set! (-> self clock) (-> *display* base-clock))
(apply-settings *setting-control*)
(if (or (zero? (logand (-> self flags) (fail-mission-flags famflags-2)))
(if (or (not (logtest? (-> self flags) (fail-mission-flags famflags-2)))
(nonzero? (-> self fail-message))
(= (-> self message) (fail-mission-message fammsg-1))
)
@@ -2133,7 +2133,7 @@
(with-pp
(the-as
symbol
(and (or (zero? (logand (-> obj node-info flags) (game-task-node-flag city-wait)))
(and (or (not (logtest? (-> obj node-info flags) (game-task-node-flag city-wait)))
(let ((a0-2 (level-get-target-inside *level*)))
(cond
((not (and a0-2 (logtest? (-> a0-2 info level-flags) 1)))
@@ -2161,7 +2161,7 @@
:event task-manager-event-handler
:trans (behavior ()
(if (or (and (nonzero? (-> self info final-node)) (task-node-closed? (-> self info final-node)))
(and (zero? (logand (-> self node-info flags) (game-task-node-flag closed)))
(and (not (logtest? (-> self node-info flags) (game-task-node-flag closed)))
(not (open? (-> self node-info)))
)
)