From 6352ef2a4dc3b84afa06bda611f13c69ca6b8407 Mon Sep 17 00:00:00 2001 From: ManDude <7569514+ManDude@users.noreply.github.com> Date: Fri, 15 Sep 2023 23:09:38 +0100 Subject: [PATCH] [jak2] fix `task-arrow-spawn` decomp (#2995) --- decompiler/config/jak2/all-types.gc | 2 +- goal_src/jak2/engine/game/task/task-arrow.gc | 7 +------ goal_src/jak2/levels/atoll/atoll-obs.gc | 2 +- goal_src/jak2/levels/castle/pad/castle-tasks.gc | 2 +- goal_src/jak2/levels/city/ctywide-tasks.gc | 6 +++--- .../jak2/levels/city/kiddogescort/hal4-course.gc | 2 +- .../jak2/levels/city/meet-brutter/meet-brutter.gc | 2 +- goal_src/jak2/levels/city/package/delivery-task.gc | 2 +- goal_src/jak2/levels/city/protect/protect.gc | 2 +- goal_src/jak2/levels/city/sack/collection-task.gc | 2 +- goal_src/jak2/levels/city/shuttle/shuttle.gc | 2 +- goal_src/jak2/levels/common/race/race-manager.gc | 2 +- goal_src/jak2/levels/common/scene-actor.gc | 2 +- goal_src/jak2/levels/gungame/gungame-obs.gc | 4 ++-- goal_src/jak2/levels/mountain/mountain-obs.gc | 2 +- goal_src/jak2/levels/mountain/mountain-obs2.gc | 2 +- goal_src/jak2/levels/ruins/ruins-obs.gc | 4 ++-- goal_src/jak2/levels/stadium/skate/skatea-obs.gc | 12 ++++++------ goal_src/jak2/levels/strip/strip-drop.gc | 2 +- goal_src/jak2/levels/strip/strip-obs.gc | 2 +- .../jak2/engine/game/task/task-arrow_REF.gc | 2 +- .../reference/jak2/levels/atoll/atoll-obs_REF.gc | 2 +- .../jak2/levels/castle/pad/castle-tasks_REF.gc | 2 +- .../reference/jak2/levels/city/ctywide-tasks_REF.gc | 6 +++--- .../jak2/levels/city/kiddogescort/hal4-course_REF.gc | 2 +- .../levels/city/meet-brutter/meet-brutter_REF.gc | 2 +- .../jak2/levels/city/package/delivery-task_REF.gc | 2 +- .../jak2/levels/city/protect/protect_REF.gc | 2 +- .../jak2/levels/city/sack/collection-task_REF.gc | 2 +- .../jak2/levels/city/shuttle/shuttle_REF.gc | 2 +- .../jak2/levels/common/race/race-manager_REF.gc | 2 +- .../reference/jak2/levels/common/scene-actor_REF.gc | 2 +- .../reference/jak2/levels/gungame/gungame-obs_REF.gc | 4 ++-- .../jak2/levels/mountain/mountain-obs2_REF.gc | 2 +- .../jak2/levels/mountain/mountain-obs_REF.gc | 2 +- .../reference/jak2/levels/ruins/ruins-obs_REF.gc | 4 ++-- .../jak2/levels/stadium/skate/skatea-obs_REF.gc | 12 ++++++------ .../reference/jak2/levels/strip/strip-drop_REF.gc | 2 +- .../reference/jak2/levels/strip/strip-obs_REF.gc | 2 +- 39 files changed, 57 insertions(+), 62 deletions(-) diff --git a/decompiler/config/jak2/all-types.gc b/decompiler/config/jak2/all-types.gc index 2be9e7fb00..a41d9a91cf 100644 --- a/decompiler/config/jak2/all-types.gc +++ b/decompiler/config/jak2/all-types.gc @@ -29556,7 +29556,7 @@ ) (define-extern task-arrow-init-by-other (function task-arrow-params task-arrow :behavior task-arrow)) -(define-extern task-arrow-spawn (function task-arrow-params task-arrow process)) +(define-extern task-arrow-spawn (function task-arrow-params process-tree process)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; projectile ;; diff --git a/goal_src/jak2/engine/game/task/task-arrow.gc b/goal_src/jak2/engine/game/task/task-arrow.gc index 4b8d84e29d..07a98c37b4 100644 --- a/goal_src/jak2/engine/game/task/task-arrow.gc +++ b/goal_src/jak2/engine/game/task/task-arrow.gc @@ -16,11 +16,6 @@ ) ;; ---task-arrow-flags -(declare-type task-arrow-params structure) -(declare-type task-arrow process-drawable) -(define-extern task-arrow-init-by-other (function task-arrow-params task-arrow :behavior task-arrow)) -(define-extern task-arrow-spawn (function task-arrow-params task-arrow process)) - ;; DECOMP BEGINS (defskelgroup skel-task-arrow ctywide-arrow ctywide-arrow-lod0-jg ctywide-arrow-idle-ja @@ -311,7 +306,7 @@ or collectable items on the ground (jetboard / weapon upgrades / etc)" (the-as task-arrow (go-virtual idle)) ) -(defun task-arrow-spawn ((arg0 task-arrow-params) (arg1 task-arrow)) +(defun task-arrow-spawn ((arg0 task-arrow-params) (arg1 process-tree)) (let ((gp-0 (the-as process #f))) (let ((v1-1 (process-spawn task-arrow arg0 :to arg1))) (if v1-1 diff --git a/goal_src/jak2/levels/atoll/atoll-obs.gc b/goal_src/jak2/levels/atoll/atoll-obs.gc index ad77bfa270..6b869257ec 100644 --- a/goal_src/jak2/levels/atoll/atoll-obs.gc +++ b/goal_src/jak2/levels/atoll/atoll-obs.gc @@ -1334,7 +1334,7 @@ This commonly includes things such as: (quaternion-identity! (-> gp-5 quat)) (set! (-> gp-5 flags) (task-arrow-flags)) (set! (-> gp-5 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn gp-5 (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn gp-5 self))) ) ) (label cfg-36) diff --git a/goal_src/jak2/levels/castle/pad/castle-tasks.gc b/goal_src/jak2/levels/castle/pad/castle-tasks.gc index 09403ad4b6..1848c9cb1d 100644 --- a/goal_src/jak2/levels/castle/pad/castle-tasks.gc +++ b/goal_src/jak2/levels/castle/pad/castle-tasks.gc @@ -18,7 +18,7 @@ (quaternion-identity! (-> gp-0 quat)) (set! (-> gp-0 flags) (task-arrow-flags)) (set! (-> gp-0 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn gp-0 (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn gp-0 self))) ) (until #f (when (< (vector-vector-distance (target-pos 0) (-> self info end-sphere)) (-> self info end-sphere r)) diff --git a/goal_src/jak2/levels/city/ctywide-tasks.gc b/goal_src/jak2/levels/city/ctywide-tasks.gc index f952ee827f..639acfe66f 100644 --- a/goal_src/jak2/levels/city/ctywide-tasks.gc +++ b/goal_src/jak2/levels/city/ctywide-tasks.gc @@ -65,7 +65,7 @@ (quaternion-identity! (-> gp-0 quat)) (set! (-> gp-0 flags) (task-arrow-flags)) (set! (-> gp-0 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn gp-0 (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn gp-0 self))) ) (none) ) @@ -406,7 +406,7 @@ (set! (-> gp-1 flags) (task-arrow-flags task-arrow-flag-00)) (set! (-> gp-1 map-icon) (the-as uint 12)) (label cfg-10) - (let ((a0-20 (task-arrow-spawn gp-1 (the-as task-arrow self)))) + (let ((a0-20 (task-arrow-spawn gp-1 self))) (when (not a0-20) (suspend) (goto cfg-10) @@ -756,7 +756,7 @@ ) ) (label cfg-12) - (let ((a0-20 (task-arrow-spawn s5-1 (the-as task-arrow self)))) + (let ((a0-20 (task-arrow-spawn s5-1 self))) (when (not a0-20) (suspend) (goto cfg-12) diff --git a/goal_src/jak2/levels/city/kiddogescort/hal4-course.gc b/goal_src/jak2/levels/city/kiddogescort/hal4-course.gc index bf0a7fb8be..626fd1b1fc 100644 --- a/goal_src/jak2/levels/city/kiddogescort/hal4-course.gc +++ b/goal_src/jak2/levels/city/kiddogescort/hal4-course.gc @@ -760,7 +760,7 @@ (quaternion-identity! (-> s5-0 quat)) (set! (-> s5-0 flags) (task-arrow-flags)) (set! (-> s5-0 map-icon) (the-as uint 15)) - (set! (-> arg0 arrow-handle) (process->handle (task-arrow-spawn s5-0 (the-as task-arrow arg0)))) + (set! (-> arg0 arrow-handle) (process->handle (task-arrow-spawn s5-0 arg0))) ) (let ((v1-24 (get-task-by-type (-> arg0 ai-ctrl) halt-wait-spot arg0))) (set! (-> v1-24 bytes 5) 1) diff --git a/goal_src/jak2/levels/city/meet-brutter/meet-brutter.gc b/goal_src/jak2/levels/city/meet-brutter/meet-brutter.gc index 4dcff22470..093fb3e3ef 100644 --- a/goal_src/jak2/levels/city/meet-brutter/meet-brutter.gc +++ b/goal_src/jak2/levels/city/meet-brutter/meet-brutter.gc @@ -2986,7 +2986,7 @@ (quaternion-identity! (-> s5-1 quat)) (set! (-> s5-1 flags) (task-arrow-flags)) (set! (-> s5-1 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn s5-1 (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn s5-1 self))) ) ) ) diff --git a/goal_src/jak2/levels/city/package/delivery-task.gc b/goal_src/jak2/levels/city/package/delivery-task.gc index 29c27c7eeb..5ee60231f8 100644 --- a/goal_src/jak2/levels/city/package/delivery-task.gc +++ b/goal_src/jak2/levels/city/package/delivery-task.gc @@ -163,7 +163,7 @@ This commonly includes things such as: (set! (-> s4-0 flags) (task-arrow-flags task-arrow-flag-03)) (set! (-> s4-0 map-icon) (the-as uint 15)) (label cfg-21) - (let ((a0-30 (task-arrow-spawn s4-0 (the-as task-arrow self)))) + (let ((a0-30 (task-arrow-spawn s4-0 self))) (when (not a0-30) (format #t "waiting for task-arrow~%") (suspend) diff --git a/goal_src/jak2/levels/city/protect/protect.gc b/goal_src/jak2/levels/city/protect/protect.gc index 54f758a3a8..c720053121 100644 --- a/goal_src/jak2/levels/city/protect/protect.gc +++ b/goal_src/jak2/levels/city/protect/protect.gc @@ -380,7 +380,7 @@ This commonly includes things such as: (quaternion-identity! (-> gp-2 quat)) (set! (-> gp-2 flags) (task-arrow-flags)) (set! (-> gp-2 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn gp-2 (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn gp-2 self))) ) (set! (-> self data-int32 0) 0) 0 diff --git a/goal_src/jak2/levels/city/sack/collection-task.gc b/goal_src/jak2/levels/city/sack/collection-task.gc index 46052b4959..7a725bc7aa 100644 --- a/goal_src/jak2/levels/city/sack/collection-task.gc +++ b/goal_src/jak2/levels/city/sack/collection-task.gc @@ -137,7 +137,7 @@ (quaternion-identity! (-> beam-params quat)) (set! (-> beam-params flags) (task-arrow-flags)) (set! (-> beam-params map-icon) (the-as uint 15)) - (task-arrow-spawn beam-params (the-as task-arrow self)) + (task-arrow-spawn beam-params self) ) (until #f (ja-no-eval :group! (ja-group) diff --git a/goal_src/jak2/levels/city/shuttle/shuttle.gc b/goal_src/jak2/levels/city/shuttle/shuttle.gc index 46e833dbd2..f974ccc498 100644 --- a/goal_src/jak2/levels/city/shuttle/shuttle.gc +++ b/goal_src/jak2/levels/city/shuttle/shuttle.gc @@ -1039,7 +1039,7 @@ (quaternion-identity! (-> s4-1 quat)) (set! (-> s4-1 flags) (task-arrow-flags)) (set! (-> s4-1 map-icon) (the-as uint 15)) - (set! (-> arg0 arrow) (process->handle (task-arrow-spawn s4-1 (the-as task-arrow arg0)))) + (set! (-> arg0 arrow) (process->handle (task-arrow-spawn s4-1 arg0))) ) (set-parking-spot-prob *traffic-engine* 11 0.08) (set-parking-spot-prob *traffic-engine* 12 0.08) diff --git a/goal_src/jak2/levels/common/race/race-manager.gc b/goal_src/jak2/levels/common/race/race-manager.gc index a8492bd226..350185f699 100644 --- a/goal_src/jak2/levels/common/race/race-manager.gc +++ b/goal_src/jak2/levels/common/race/race-manager.gc @@ -1058,7 +1058,7 @@ (let ((t9-11 task-arrow-spawn) (a1-17 obj) ) - (set! (-> gp-0 arrow) (process->handle (t9-11 sv-352 (the-as task-arrow a1-17)))) + (set! (-> gp-0 arrow) (process->handle (t9-11 sv-352 a1-17))) ) (set! (-> s4-0 params position quad) (-> gp-0 info player-intro-pos quad)) (+! (-> s4-0 params position y) 12288.0) diff --git a/goal_src/jak2/levels/common/scene-actor.gc b/goal_src/jak2/levels/common/scene-actor.gc index 39f3de7479..525ce6ac5f 100644 --- a/goal_src/jak2/levels/common/scene-actor.gc +++ b/goal_src/jak2/levels/common/scene-actor.gc @@ -687,7 +687,7 @@ This commonly includes things such as: ) (set! (-> s5-0 flags) (task-arrow-flags)) (set! (-> s5-0 map-icon) (the-as uint 15)) - (task-arrow-spawn s5-0 (the-as task-arrow obj)) + (task-arrow-spawn s5-0 obj) ) ) ) diff --git a/goal_src/jak2/levels/gungame/gungame-obs.gc b/goal_src/jak2/levels/gungame/gungame-obs.gc index b4adda2867..9570c3e563 100644 --- a/goal_src/jak2/levels/gungame/gungame-obs.gc +++ b/goal_src/jak2/levels/gungame/gungame-obs.gc @@ -2544,7 +2544,7 @@ This commonly includes things such as: (quaternion-identity! (-> s5-1 quat)) (set! (-> s5-1 flags) (task-arrow-flags)) (set! (-> s5-1 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn s5-1 (the-as task-arrow gp-0)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn s5-1 gp-0))) ) ) ) @@ -2592,7 +2592,7 @@ This commonly includes things such as: (quaternion-identity! (-> s5-1 quat)) (set! (-> s5-1 flags) (task-arrow-flags)) (set! (-> s5-1 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn s5-1 (the-as task-arrow gp-0)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn s5-1 gp-0))) ) ) ) diff --git a/goal_src/jak2/levels/mountain/mountain-obs.gc b/goal_src/jak2/levels/mountain/mountain-obs.gc index 86a47fa0f1..eb46163ecf 100644 --- a/goal_src/jak2/levels/mountain/mountain-obs.gc +++ b/goal_src/jak2/levels/mountain/mountain-obs.gc @@ -3245,7 +3245,7 @@ This commonly includes things such as: (quaternion-identity! (-> gp-0 quat)) (set! (-> gp-0 flags) (task-arrow-flags)) (set! (-> gp-0 map-icon) (the-as uint 15)) - (task-arrow-spawn gp-0 (the-as task-arrow self)) + (task-arrow-spawn gp-0 self) ) ) (let ((t9-5 (-> (the-as state (find-parent-method trans-plat 34)) enter))) diff --git a/goal_src/jak2/levels/mountain/mountain-obs2.gc b/goal_src/jak2/levels/mountain/mountain-obs2.gc index be2dab1176..02048472c6 100644 --- a/goal_src/jak2/levels/mountain/mountain-obs2.gc +++ b/goal_src/jak2/levels/mountain/mountain-obs2.gc @@ -351,7 +351,7 @@ For example for an elevator pre-compute the distance between the first and last (quaternion-identity! (-> arrow-params quat)) (set! (-> arrow-params flags) (task-arrow-flags)) (set! (-> arrow-params map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn arrow-params (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn arrow-params self))) ) (until #f (let ((dist-from-target (vector-vector-distance (target-pos 0) (-> self info end-sphere)))) diff --git a/goal_src/jak2/levels/ruins/ruins-obs.gc b/goal_src/jak2/levels/ruins/ruins-obs.gc index 6ee9ebef4a..2056cde12d 100644 --- a/goal_src/jak2/levels/ruins/ruins-obs.gc +++ b/goal_src/jak2/levels/ruins/ruins-obs.gc @@ -771,7 +771,7 @@ This commonly includes things such as: (quaternion-identity! (-> gp-5 quat)) (set! (-> gp-5 flags) (task-arrow-flags)) (set! (-> gp-5 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn gp-5 (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn gp-5 self))) ) ) (label cfg-39) @@ -802,7 +802,7 @@ This commonly includes things such as: (quaternion-identity! (-> s5-0 quat)) (set! (-> s5-0 flags) (task-arrow-flags)) (set! (-> s5-0 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn s5-0 (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn s5-0 self))) ) ) (b! #t cfg-17 :delay (nop!)) diff --git a/goal_src/jak2/levels/stadium/skate/skatea-obs.gc b/goal_src/jak2/levels/stadium/skate/skatea-obs.gc index a596508d90..d6a30db021 100644 --- a/goal_src/jak2/levels/stadium/skate/skatea-obs.gc +++ b/goal_src/jak2/levels/stadium/skate/skatea-obs.gc @@ -199,7 +199,7 @@ (quaternion-identity! (-> gp-0 quat)) (set! (-> gp-0 flags) (task-arrow-flags)) (set! (-> gp-0 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn gp-0 (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn gp-0 self))) ) ) ) @@ -409,7 +409,7 @@ (quaternion-identity! (-> gp-1 quat)) (set! (-> gp-1 flags) (task-arrow-flags)) (set! (-> gp-1 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn gp-1 (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn gp-1 self))) ) (send-event *target* 'get-notify self) (set! (-> self trick-type) (board-tricks none)) @@ -483,7 +483,7 @@ (quaternion-identity! (-> gp-1 quat)) (set! (-> gp-1 flags) (task-arrow-flags)) (set! (-> gp-1 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn gp-1 (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn gp-1 self))) ) (send-event *target* 'get-notify self) (set! (-> self trick-type) (board-tricks none)) @@ -998,7 +998,7 @@ (quaternion-identity! (-> gp-0 quat)) (set! (-> gp-0 flags) (task-arrow-flags)) (set! (-> gp-0 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn gp-0 (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn gp-0 self))) ) (set! (-> self score) -1.0) ) @@ -1128,7 +1128,7 @@ (quaternion-identity! (-> gp-4 quat)) (set! (-> gp-4 flags) (task-arrow-flags)) (set! (-> gp-4 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn gp-4 (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn gp-4 self))) ) (else (set! (-> *game-info* sub-task-list (game-task-node stadium-board1-training-judge) death-count) @@ -1151,7 +1151,7 @@ (quaternion-identity! (-> gp-4 quat)) (set! (-> gp-4 flags) (task-arrow-flags)) (set! (-> gp-4 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn gp-4 (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn gp-4 self))) ) ) ) diff --git a/goal_src/jak2/levels/strip/strip-drop.gc b/goal_src/jak2/levels/strip/strip-drop.gc index 1adb3ee2c6..bddbd1c1a5 100644 --- a/goal_src/jak2/levels/strip/strip-drop.gc +++ b/goal_src/jak2/levels/strip/strip-drop.gc @@ -544,7 +544,7 @@ This commonly includes things such as: ) (set! (-> s5-2 flags) (task-arrow-flags task-arrow-flag-02)) (set! (-> s5-2 map-icon) (the-as uint 15)) - (task-arrow-spawn s5-2 (the-as task-arrow obj)) + (task-arrow-spawn s5-2 obj) ) ) (if (task-node-closed? (game-task-node strip-drop-resolution)) diff --git a/goal_src/jak2/levels/strip/strip-obs.gc b/goal_src/jak2/levels/strip/strip-obs.gc index 7fb6411325..691e7e78c3 100644 --- a/goal_src/jak2/levels/strip/strip-obs.gc +++ b/goal_src/jak2/levels/strip/strip-obs.gc @@ -1745,7 +1745,7 @@ This commonly includes things such as: (quaternion-identity! (-> gp-0 quat)) (set! (-> gp-0 flags) (task-arrow-flags)) (set! (-> gp-0 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn gp-0 (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn gp-0 self))) ) (while (>= (vector-vector-distance (target-pos 0) (-> self info end-sphere)) (-> self info end-sphere r)) (suspend) diff --git a/test/decompiler/reference/jak2/engine/game/task/task-arrow_REF.gc b/test/decompiler/reference/jak2/engine/game/task/task-arrow_REF.gc index 579fabe24f..a3394be416 100644 --- a/test/decompiler/reference/jak2/engine/game/task/task-arrow_REF.gc +++ b/test/decompiler/reference/jak2/engine/game/task/task-arrow_REF.gc @@ -345,7 +345,7 @@ or collectable items on the ground (jetboard / weapon upgrades / etc)" ) ;; definition for function task-arrow-spawn -(defun task-arrow-spawn ((arg0 task-arrow-params) (arg1 task-arrow)) +(defun task-arrow-spawn ((arg0 task-arrow-params) (arg1 process-tree)) (let ((gp-0 (the-as process #f))) (let ((v1-1 (process-spawn task-arrow arg0 :to arg1))) (if v1-1 diff --git a/test/decompiler/reference/jak2/levels/atoll/atoll-obs_REF.gc b/test/decompiler/reference/jak2/levels/atoll/atoll-obs_REF.gc index 66597f66a2..64cdb444a0 100644 --- a/test/decompiler/reference/jak2/levels/atoll/atoll-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/atoll/atoll-obs_REF.gc @@ -1534,7 +1534,7 @@ This commonly includes things such as: (quaternion-identity! (-> gp-5 quat)) (set! (-> gp-5 flags) (task-arrow-flags)) (set! (-> gp-5 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn gp-5 (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn gp-5 self))) ) ) (label cfg-36) diff --git a/test/decompiler/reference/jak2/levels/castle/pad/castle-tasks_REF.gc b/test/decompiler/reference/jak2/levels/castle/pad/castle-tasks_REF.gc index 8eef4893b1..f0efcb7db0 100644 --- a/test/decompiler/reference/jak2/levels/castle/pad/castle-tasks_REF.gc +++ b/test/decompiler/reference/jak2/levels/castle/pad/castle-tasks_REF.gc @@ -13,7 +13,7 @@ (quaternion-identity! (-> gp-0 quat)) (set! (-> gp-0 flags) (task-arrow-flags)) (set! (-> gp-0 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn gp-0 (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn gp-0 self))) ) (until #f (when (< (vector-vector-distance (target-pos 0) (-> self info end-sphere)) (-> self info end-sphere r)) diff --git a/test/decompiler/reference/jak2/levels/city/ctywide-tasks_REF.gc b/test/decompiler/reference/jak2/levels/city/ctywide-tasks_REF.gc index a5e69e78b9..327f821115 100644 --- a/test/decompiler/reference/jak2/levels/city/ctywide-tasks_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/ctywide-tasks_REF.gc @@ -62,7 +62,7 @@ (quaternion-identity! (-> gp-0 quat)) (set! (-> gp-0 flags) (task-arrow-flags)) (set! (-> gp-0 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn gp-0 (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn gp-0 self))) ) (none) ) @@ -417,7 +417,7 @@ (set! (-> gp-1 flags) (task-arrow-flags task-arrow-flag-00)) (set! (-> gp-1 map-icon) (the-as uint 12)) (label cfg-10) - (let ((a0-20 (task-arrow-spawn gp-1 (the-as task-arrow self)))) + (let ((a0-20 (task-arrow-spawn gp-1 self))) (when (not a0-20) (suspend) (goto cfg-10) @@ -802,7 +802,7 @@ ) ) (label cfg-12) - (let ((a0-20 (task-arrow-spawn s5-1 (the-as task-arrow self)))) + (let ((a0-20 (task-arrow-spawn s5-1 self))) (when (not a0-20) (suspend) (goto cfg-12) diff --git a/test/decompiler/reference/jak2/levels/city/kiddogescort/hal4-course_REF.gc b/test/decompiler/reference/jak2/levels/city/kiddogescort/hal4-course_REF.gc index 18c9de794c..f2886ea781 100644 --- a/test/decompiler/reference/jak2/levels/city/kiddogescort/hal4-course_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/kiddogescort/hal4-course_REF.gc @@ -826,7 +826,7 @@ (quaternion-identity! (-> s5-0 quat)) (set! (-> s5-0 flags) (task-arrow-flags)) (set! (-> s5-0 map-icon) (the-as uint 15)) - (set! (-> arg0 arrow-handle) (process->handle (task-arrow-spawn s5-0 (the-as task-arrow arg0)))) + (set! (-> arg0 arrow-handle) (process->handle (task-arrow-spawn s5-0 arg0))) ) (let ((v1-24 (get-task-by-type (-> arg0 ai-ctrl) halt-wait-spot arg0))) (set! (-> v1-24 bytes 5) 1) diff --git a/test/decompiler/reference/jak2/levels/city/meet-brutter/meet-brutter_REF.gc b/test/decompiler/reference/jak2/levels/city/meet-brutter/meet-brutter_REF.gc index 36687d3587..ed72cb5dd8 100644 --- a/test/decompiler/reference/jak2/levels/city/meet-brutter/meet-brutter_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/meet-brutter/meet-brutter_REF.gc @@ -3141,7 +3141,7 @@ (quaternion-identity! (-> s5-1 quat)) (set! (-> s5-1 flags) (task-arrow-flags)) (set! (-> s5-1 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn s5-1 (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn s5-1 self))) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/city/package/delivery-task_REF.gc b/test/decompiler/reference/jak2/levels/city/package/delivery-task_REF.gc index ebc5147867..bdcb08aef2 100644 --- a/test/decompiler/reference/jak2/levels/city/package/delivery-task_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/package/delivery-task_REF.gc @@ -184,7 +184,7 @@ This commonly includes things such as: (set! (-> s4-0 flags) (task-arrow-flags task-arrow-flag-03)) (set! (-> s4-0 map-icon) (the-as uint 15)) (label cfg-21) - (let ((a0-30 (task-arrow-spawn s4-0 (the-as task-arrow self)))) + (let ((a0-30 (task-arrow-spawn s4-0 self))) (when (not a0-30) (format #t "waiting for task-arrow~%") (suspend) diff --git a/test/decompiler/reference/jak2/levels/city/protect/protect_REF.gc b/test/decompiler/reference/jak2/levels/city/protect/protect_REF.gc index fac69d2780..3600023f34 100644 --- a/test/decompiler/reference/jak2/levels/city/protect/protect_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/protect/protect_REF.gc @@ -421,7 +421,7 @@ This commonly includes things such as: (quaternion-identity! (-> gp-2 quat)) (set! (-> gp-2 flags) (task-arrow-flags)) (set! (-> gp-2 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn gp-2 (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn gp-2 self))) ) (set! (-> self data-int32 0) 0) 0 diff --git a/test/decompiler/reference/jak2/levels/city/sack/collection-task_REF.gc b/test/decompiler/reference/jak2/levels/city/sack/collection-task_REF.gc index 29fcf860a3..040b9541c9 100644 --- a/test/decompiler/reference/jak2/levels/city/sack/collection-task_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/sack/collection-task_REF.gc @@ -154,7 +154,7 @@ (quaternion-identity! (-> beam-params quat)) (set! (-> beam-params flags) (task-arrow-flags)) (set! (-> beam-params map-icon) (the-as uint 15)) - (task-arrow-spawn beam-params (the-as task-arrow self)) + (task-arrow-spawn beam-params self) ) (until #f (ja-no-eval :group! (ja-group) diff --git a/test/decompiler/reference/jak2/levels/city/shuttle/shuttle_REF.gc b/test/decompiler/reference/jak2/levels/city/shuttle/shuttle_REF.gc index a867dad7e0..fab5acd787 100644 --- a/test/decompiler/reference/jak2/levels/city/shuttle/shuttle_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/shuttle/shuttle_REF.gc @@ -1096,7 +1096,7 @@ (quaternion-identity! (-> s4-1 quat)) (set! (-> s4-1 flags) (task-arrow-flags)) (set! (-> s4-1 map-icon) (the-as uint 15)) - (set! (-> arg0 arrow) (process->handle (task-arrow-spawn s4-1 (the-as task-arrow arg0)))) + (set! (-> arg0 arrow) (process->handle (task-arrow-spawn s4-1 arg0))) ) (set-parking-spot-prob *traffic-engine* 11 0.08) (set-parking-spot-prob *traffic-engine* 12 0.08) diff --git a/test/decompiler/reference/jak2/levels/common/race/race-manager_REF.gc b/test/decompiler/reference/jak2/levels/common/race/race-manager_REF.gc index 28443f7f6c..cc276bf87f 100644 --- a/test/decompiler/reference/jak2/levels/common/race/race-manager_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/race/race-manager_REF.gc @@ -1089,7 +1089,7 @@ (let ((t9-11 task-arrow-spawn) (a1-17 obj) ) - (set! (-> gp-0 arrow) (process->handle (t9-11 sv-352 (the-as task-arrow a1-17)))) + (set! (-> gp-0 arrow) (process->handle (t9-11 sv-352 a1-17))) ) (set! (-> s4-0 params position quad) (-> gp-0 info player-intro-pos quad)) (+! (-> s4-0 params position y) 12288.0) diff --git a/test/decompiler/reference/jak2/levels/common/scene-actor_REF.gc b/test/decompiler/reference/jak2/levels/common/scene-actor_REF.gc index 16f1fe73f5..034312521e 100644 --- a/test/decompiler/reference/jak2/levels/common/scene-actor_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/scene-actor_REF.gc @@ -863,7 +863,7 @@ This commonly includes things such as: ) (set! (-> s5-0 flags) (task-arrow-flags)) (set! (-> s5-0 map-icon) (the-as uint 15)) - (task-arrow-spawn s5-0 (the-as task-arrow obj)) + (task-arrow-spawn s5-0 obj) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc b/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc index 5eb19bd0ac..2d65ab906b 100644 --- a/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc @@ -2652,7 +2652,7 @@ This commonly includes things such as: (quaternion-identity! (-> s5-1 quat)) (set! (-> s5-1 flags) (task-arrow-flags)) (set! (-> s5-1 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn s5-1 (the-as task-arrow gp-0)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn s5-1 gp-0))) ) ) ) @@ -2702,7 +2702,7 @@ This commonly includes things such as: (quaternion-identity! (-> s5-1 quat)) (set! (-> s5-1 flags) (task-arrow-flags)) (set! (-> s5-1 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn s5-1 (the-as task-arrow gp-0)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn s5-1 gp-0))) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/mountain/mountain-obs2_REF.gc b/test/decompiler/reference/jak2/levels/mountain/mountain-obs2_REF.gc index 83858e18e8..c79ee57ba7 100644 --- a/test/decompiler/reference/jak2/levels/mountain/mountain-obs2_REF.gc +++ b/test/decompiler/reference/jak2/levels/mountain/mountain-obs2_REF.gc @@ -396,7 +396,7 @@ For example for an elevator pre-compute the distance between the first and last (quaternion-identity! (-> arrow-params quat)) (set! (-> arrow-params flags) (task-arrow-flags)) (set! (-> arrow-params map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn arrow-params (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn arrow-params self))) ) (until #f (let ((dist-from-target (vector-vector-distance (target-pos 0) (-> self info end-sphere)))) diff --git a/test/decompiler/reference/jak2/levels/mountain/mountain-obs_REF.gc b/test/decompiler/reference/jak2/levels/mountain/mountain-obs_REF.gc index 3a8044ce6a..ae16bb210f 100644 --- a/test/decompiler/reference/jak2/levels/mountain/mountain-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/mountain/mountain-obs_REF.gc @@ -3578,7 +3578,7 @@ This commonly includes things such as: (quaternion-identity! (-> gp-0 quat)) (set! (-> gp-0 flags) (task-arrow-flags)) (set! (-> gp-0 map-icon) (the-as uint 15)) - (task-arrow-spawn gp-0 (the-as task-arrow self)) + (task-arrow-spawn gp-0 self) ) ) (let ((t9-5 (-> (the-as state (find-parent-method trans-plat 34)) enter))) diff --git a/test/decompiler/reference/jak2/levels/ruins/ruins-obs_REF.gc b/test/decompiler/reference/jak2/levels/ruins/ruins-obs_REF.gc index c52f50d973..d6827cdbc4 100644 --- a/test/decompiler/reference/jak2/levels/ruins/ruins-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/ruins/ruins-obs_REF.gc @@ -768,7 +768,7 @@ This commonly includes things such as: (quaternion-identity! (-> gp-5 quat)) (set! (-> gp-5 flags) (task-arrow-flags)) (set! (-> gp-5 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn gp-5 (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn gp-5 self))) ) ) (label cfg-39) @@ -801,7 +801,7 @@ This commonly includes things such as: (quaternion-identity! (-> s5-0 quat)) (set! (-> s5-0 flags) (task-arrow-flags)) (set! (-> s5-0 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn s5-0 (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn s5-0 self))) ) ) (b! #t cfg-17 :delay (nop!)) diff --git a/test/decompiler/reference/jak2/levels/stadium/skate/skatea-obs_REF.gc b/test/decompiler/reference/jak2/levels/stadium/skate/skatea-obs_REF.gc index 4850d4252c..10290af053 100644 --- a/test/decompiler/reference/jak2/levels/stadium/skate/skatea-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/stadium/skate/skatea-obs_REF.gc @@ -239,7 +239,7 @@ (quaternion-identity! (-> gp-0 quat)) (set! (-> gp-0 flags) (task-arrow-flags)) (set! (-> gp-0 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn gp-0 (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn gp-0 self))) ) ) ) @@ -455,7 +455,7 @@ (quaternion-identity! (-> gp-1 quat)) (set! (-> gp-1 flags) (task-arrow-flags)) (set! (-> gp-1 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn gp-1 (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn gp-1 self))) ) (send-event *target* 'get-notify self) (set! (-> self trick-type) (board-tricks none)) @@ -530,7 +530,7 @@ (quaternion-identity! (-> gp-1 quat)) (set! (-> gp-1 flags) (task-arrow-flags)) (set! (-> gp-1 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn gp-1 (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn gp-1 self))) ) (send-event *target* 'get-notify self) (set! (-> self trick-type) (board-tricks none)) @@ -1051,7 +1051,7 @@ (quaternion-identity! (-> gp-0 quat)) (set! (-> gp-0 flags) (task-arrow-flags)) (set! (-> gp-0 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn gp-0 (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn gp-0 self))) ) (set! (-> self score) -1.0) ) @@ -1178,7 +1178,7 @@ (quaternion-identity! (-> gp-4 quat)) (set! (-> gp-4 flags) (task-arrow-flags)) (set! (-> gp-4 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn gp-4 (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn gp-4 self))) ) (else (set! (-> *game-info* sub-task-list (game-task-node stadium-board1-training-judge) death-count) @@ -1201,7 +1201,7 @@ (quaternion-identity! (-> gp-4 quat)) (set! (-> gp-4 flags) (task-arrow-flags)) (set! (-> gp-4 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn gp-4 (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn gp-4 self))) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/strip/strip-drop_REF.gc b/test/decompiler/reference/jak2/levels/strip/strip-drop_REF.gc index 4b500bf672..1a18ebf933 100644 --- a/test/decompiler/reference/jak2/levels/strip/strip-drop_REF.gc +++ b/test/decompiler/reference/jak2/levels/strip/strip-drop_REF.gc @@ -616,7 +616,7 @@ This commonly includes things such as: ) (set! (-> s5-2 flags) (task-arrow-flags task-arrow-flag-02)) (set! (-> s5-2 map-icon) (the-as uint 15)) - (task-arrow-spawn s5-2 (the-as task-arrow obj)) + (task-arrow-spawn s5-2 obj) ) ) (if (task-node-closed? (game-task-node strip-drop-resolution)) diff --git a/test/decompiler/reference/jak2/levels/strip/strip-obs_REF.gc b/test/decompiler/reference/jak2/levels/strip/strip-obs_REF.gc index 9ef877ccbf..f2e329bfb6 100644 --- a/test/decompiler/reference/jak2/levels/strip/strip-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/strip/strip-obs_REF.gc @@ -1930,7 +1930,7 @@ This commonly includes things such as: (quaternion-identity! (-> gp-0 quat)) (set! (-> gp-0 flags) (task-arrow-flags)) (set! (-> gp-0 map-icon) (the-as uint 15)) - (set! (-> self arrow) (process->handle (task-arrow-spawn gp-0 (the-as task-arrow self)))) + (set! (-> self arrow) (process->handle (task-arrow-spawn gp-0 self))) ) (while (>= (vector-vector-distance (target-pos 0) (-> self info end-sphere)) (-> self info end-sphere r)) (suspend)