From 7bdb134312d2db420400fa16e484c73fae44618f Mon Sep 17 00:00:00 2001 From: water Date: Sat, 30 Sep 2023 10:57:08 -0400 Subject: [PATCH] jak2 --- goal_src/jak2/engine/ai/enemy.gc | 6 +-- goal_src/jak2/engine/ambient/ambient.gc | 2 +- .../jak2/engine/common_objs/collectables.gc | 4 +- goal_src/jak2/engine/common_objs/conveyor.gc | 6 +-- goal_src/jak2/engine/common_objs/elevator.gc | 3 +- .../engine/common_objs/rigid-body-plat.gc | 9 +--- .../jak2/engine/common_objs/water-anim.gc | 2 +- .../jak2/engine/common_objs/water-flow.gc | 2 +- goal_src/jak2/engine/debug/editable.gc | 17 ++------ .../jak2/engine/debug/nav/nav-graph-editor.gc | 6 +-- .../jak2/engine/game/task/task-control.gc | 3 +- .../jak2/engine/spatial-hash/spatial-hash.gc | 2 +- goal_src/jak2/engine/target/logic-target.gc | 2 +- goal_src/jak2/engine/ui/progress/progress.gc | 4 +- goal_src/jak2/levels/atoll/atoll-obs.gc | 8 +--- goal_src/jak2/levels/atoll/juicer.gc | 6 +-- .../jak2/levels/castle/boss/castle-baron.gc | 4 +- goal_src/jak2/levels/castle/castle-obs.gc | 6 +-- goal_src/jak2/levels/castle/pad/caspad-obs.gc | 2 +- .../jak2/levels/castle/roboguard-level.gc | 24 +++++------ goal_src/jak2/levels/city/bombbot/bombbot.gc | 3 +- goal_src/jak2/levels/city/ctywide-obs.gc | 15 +------ .../jak2/levels/city/traffic/citizen/guard.gc | 6 +-- .../traffic/citizen/metalhead-predator.gc | 9 +--- .../jak2/levels/city/traffic/vehicle/bike.gc | 12 +++--- .../jak2/levels/city/traffic/vehicle/car.gc | 9 ++-- .../levels/city/traffic/vehicle/transport.gc | 8 +--- .../city/traffic/vehicle/vehicle-rider.gc | 4 +- .../city/traffic/vehicle/vehicle-util.gc | 2 +- .../jak2/levels/common/ai/ashelin/ash-shot.gc | 2 +- goal_src/jak2/levels/common/battle.gc | 28 ++++++------ goal_src/jak2/levels/common/elec-gate.gc | 2 +- .../jak2/levels/common/enemy/centurion.gc | 12 ++---- goal_src/jak2/levels/common/enemy/flitter.gc | 2 +- .../jak2/levels/common/enemy/fodder/fodder.gc | 3 +- .../jak2/levels/common/enemy/grenadier.gc | 6 +-- goal_src/jak2/levels/common/enemy/grunt.gc | 2 +- .../enemy/guards/crimson-guard-level.gc | 6 +-- goal_src/jak2/levels/common/enemy/hopper.gc | 8 +--- .../common/enemy/hover/crimson-guard-hover.gc | 43 ++++--------------- .../jak2/levels/common/enemy/hover/flamer.gc | 6 +-- .../common/enemy/hover/hover-enemy-battle.gc | 6 +-- .../levels/common/enemy/hover/hover-enemy.gc | 2 +- .../common/enemy/hover/hover-formation.gc | 6 +-- .../jak2/levels/common/enemy/hover/wasp.gc | 2 +- .../jak2/levels/common/enemy/metalmonk.gc | 6 +-- goal_src/jak2/levels/common/enemy/spyder.gc | 8 +--- .../levels/common/entities/com-elevator.gc | 10 ++--- .../jak2/levels/common/entities/spydroid.gc | 2 +- .../jak2/levels/common/race/race-manager.gc | 2 +- goal_src/jak2/levels/common/scene-actor.gc | 2 +- goal_src/jak2/levels/dig/dig-obs.gc | 2 +- goal_src/jak2/levels/dig/dig3-obs.gc | 2 +- goal_src/jak2/levels/drill/drill-baron.gc | 11 +---- goal_src/jak2/levels/drill/drill-obs.gc | 10 ++--- goal_src/jak2/levels/drill/drillmid-obs.gc | 4 +- goal_src/jak2/levels/drill/ginsu.gc | 6 +-- goal_src/jak2/levels/forest/forest-obs.gc | 2 +- goal_src/jak2/levels/forest/predator.gc | 6 +-- goal_src/jak2/levels/forest/wren.gc | 6 +-- .../jak2/levels/fortress/dump/fordumpc-obs.gc | 8 +--- .../fortress/dump/fort-robotank-turret.gc | 2 +- .../levels/fortress/dump/fort-robotank.gc | 6 +-- .../levels/fortress/rescue/forresca-obs.gc | 2 +- .../levels/fortress/rescue/forrescb-obs.gc | 2 +- goal_src/jak2/levels/gungame/gungame-obs.gc | 2 +- goal_src/jak2/levels/hiphog/whack.gc | 8 +--- goal_src/jak2/levels/intro/intro-obs.gc | 6 +-- goal_src/jak2/levels/mountain/mountain-obs.gc | 6 +-- goal_src/jak2/levels/mountain/rhino.gc | 6 +-- goal_src/jak2/levels/nest/flying-spider.gc | 7 +-- goal_src/jak2/levels/nest/mammoth.gc | 6 +-- goal_src/jak2/levels/nest/mantis.gc | 2 +- .../jak2/levels/palace/cable/palcab-obs.gc | 2 +- goal_src/jak2/levels/ruins/rapid-gunner.gc | 6 +-- goal_src/jak2/levels/ruins/ruins-obs.gc | 2 +- goal_src/jak2/levels/sewer/hosehead.gc | 3 +- goal_src/jak2/levels/sewer/sew-gunturret.gc | 2 +- goal_src/jak2/levels/sewer/sewer-obs2.gc | 8 +--- goal_src/jak2/levels/stadium/racebike.gc | 6 +-- .../jak2/levels/stadium/skate/skatea-obs.gc | 18 ++++---- goal_src/jak2/levels/stadium/stadium-obs.gc | 6 +-- goal_src/jak2/levels/strip/strip-obs.gc | 6 +-- goal_src/jak2/levels/tomb/tomb-beetle.gc | 2 +- goal_src/jak2/levels/tomb/tomb-obs.gc | 4 +- goal_src/jak2/levels/tomb/tomb-water.gc | 2 +- goal_src/jak2/levels/tomb/widow-extras.gc | 16 ++----- goal_src/jak2/levels/under/jellyfish.gc | 4 +- goal_src/jak2/levels/under/under-obs.gc | 4 +- .../jak2/levels/under/under-shoot-block.gc | 2 +- .../reference/jak2/engine/ai/enemy_REF.gc | 6 +-- .../jak2/engine/ambient/ambient_REF.gc | 2 +- .../engine/common_objs/collectables_REF.gc | 4 +- .../jak2/engine/common_objs/conveyor_REF.gc | 6 +-- .../jak2/engine/common_objs/elevator_REF.gc | 3 +- .../engine/common_objs/rigid-body-plat_REF.gc | 9 +--- .../jak2/engine/common_objs/water-anim_REF.gc | 2 +- .../jak2/engine/common_objs/water-flow_REF.gc | 2 +- .../jak2/engine/debug/editable_REF.gc | 27 +++--------- .../engine/debug/nav/nav-graph-editor_REF.gc | 6 +-- .../jak2/engine/entity/entity_REF.gc | 4 +- .../jak2/engine/game/task/task-control_REF.gc | 3 +- .../engine/spatial-hash/spatial-hash_REF.gc | 2 +- .../jak2/engine/target/logic-target_REF.gc | 2 +- .../reference/jak2/engine/ui/minimap_REF.gc | 2 +- .../jak2/engine/ui/progress/progress_REF.gc | 2 +- .../jak2/levels/atoll/atoll-obs_REF.gc | 8 +--- .../reference/jak2/levels/atoll/juicer_REF.gc | 6 +-- .../levels/castle/boss/castle-baron_REF.gc | 4 +- .../jak2/levels/castle/castle-obs_REF.gc | 6 +-- .../jak2/levels/castle/pad/caspad-obs_REF.gc | 2 +- .../jak2/levels/castle/roboguard-level_REF.gc | 24 +++++------ .../jak2/levels/city/bombbot/bombbot_REF.gc | 3 +- .../jak2/levels/city/ctywide-obs_REF.gc | 15 +------ .../levels/city/traffic/citizen/guard_REF.gc | 6 +-- .../traffic/citizen/metalhead-predator_REF.gc | 9 +--- .../levels/city/traffic/vehicle/bike_REF.gc | 12 +++--- .../levels/city/traffic/vehicle/car_REF.gc | 9 ++-- .../city/traffic/vehicle/transport_REF.gc | 8 +--- .../city/traffic/vehicle/vehicle-rider_REF.gc | 4 +- .../city/traffic/vehicle/vehicle-util_REF.gc | 2 +- .../levels/common/ai/ashelin/ash-shot_REF.gc | 2 +- .../jak2/levels/common/battle_REF.gc | 6 +-- .../jak2/levels/common/elec-gate_REF.gc | 2 +- .../jak2/levels/common/enemy/centurion_REF.gc | 12 ++---- .../jak2/levels/common/enemy/flitter_REF.gc | 2 +- .../levels/common/enemy/fodder/fodder_REF.gc | 3 +- .../jak2/levels/common/enemy/grenadier_REF.gc | 6 +-- .../jak2/levels/common/enemy/grunt_REF.gc | 2 +- .../enemy/guards/crimson-guard-level_REF.gc | 6 +-- .../jak2/levels/common/enemy/hopper_REF.gc | 8 +--- .../enemy/hover/crimson-guard-hover_REF.gc | 43 ++++--------------- .../levels/common/enemy/hover/flamer_REF.gc | 6 +-- .../enemy/hover/hover-enemy-battle_REF.gc | 6 +-- .../common/enemy/hover/hover-enemy_REF.gc | 2 +- .../common/enemy/hover/hover-formation_REF.gc | 6 +-- .../levels/common/enemy/hover/wasp_REF.gc | 2 +- .../jak2/levels/common/enemy/metalmonk_REF.gc | 6 +-- .../jak2/levels/common/enemy/spyder_REF.gc | 8 +--- .../common/entities/com-elevator_REF.gc | 10 ++--- .../levels/common/entities/spydroid_REF.gc | 2 +- .../levels/common/race/race-manager_REF.gc | 2 +- .../jak2/levels/common/scene-actor_REF.gc | 2 +- .../reference/jak2/levels/dig/dig-obs_REF.gc | 2 +- .../reference/jak2/levels/dig/dig3-obs_REF.gc | 2 +- .../jak2/levels/drill/drill-baron_REF.gc | 11 +---- .../jak2/levels/drill/drill-obs_REF.gc | 10 ++--- .../jak2/levels/drill/drillmid-obs_REF.gc | 4 +- .../reference/jak2/levels/drill/ginsu_REF.gc | 6 +-- .../jak2/levels/forest/forest-obs_REF.gc | 2 +- .../jak2/levels/forest/predator_REF.gc | 6 +-- .../reference/jak2/levels/forest/wren_REF.gc | 6 +-- .../levels/fortress/dump/fordumpc-obs_REF.gc | 8 +--- .../fortress/dump/fort-robotank-turret_REF.gc | 2 +- .../levels/fortress/dump/fort-robotank_REF.gc | 6 +-- .../fortress/rescue/forresca-obs_REF.gc | 2 +- .../fortress/rescue/forrescb-obs_REF.gc | 2 +- .../jak2/levels/gungame/gungame-obs_REF.gc | 2 +- .../reference/jak2/levels/hiphog/whack_REF.gc | 8 +--- .../jak2/levels/intro/intro-obs_REF.gc | 6 +-- .../jak2/levels/mountain/mountain-obs_REF.gc | 6 +-- .../jak2/levels/mountain/rhino_REF.gc | 6 +-- .../jak2/levels/nest/flying-spider_REF.gc | 7 +-- .../reference/jak2/levels/nest/mammoth_REF.gc | 6 +-- .../reference/jak2/levels/nest/mantis_REF.gc | 2 +- .../levels/palace/cable/palcab-obs_REF.gc | 2 +- .../jak2/levels/ruins/rapid-gunner_REF.gc | 6 +-- .../jak2/levels/ruins/ruins-obs_REF.gc | 2 +- .../jak2/levels/sewer/hosehead_REF.gc | 3 +- .../jak2/levels/sewer/sew-gunturret_REF.gc | 2 +- .../jak2/levels/sewer/sewer-obs2_REF.gc | 8 +--- .../jak2/levels/stadium/racebike_REF.gc | 6 +-- .../levels/stadium/skate/skatea-obs_REF.gc | 2 +- .../jak2/levels/stadium/stadium-obs_REF.gc | 6 +-- .../jak2/levels/strip/strip-obs_REF.gc | 6 +-- .../jak2/levels/tomb/tomb-beetle_REF.gc | 2 +- .../jak2/levels/tomb/tomb-obs_REF.gc | 4 +- .../jak2/levels/tomb/tomb-water_REF.gc | 2 +- .../jak2/levels/tomb/widow-extras_REF.gc | 16 ++----- .../jak2/levels/under/jellyfish_REF.gc | 4 +- .../jak2/levels/under/under-obs_REF.gc | 4 +- .../levels/under/under-shoot-block_REF.gc | 2 +- 182 files changed, 331 insertions(+), 759 deletions(-) diff --git a/goal_src/jak2/engine/ai/enemy.gc b/goal_src/jak2/engine/ai/enemy.gc index 81212b5825..2b83f0a1d7 100644 --- a/goal_src/jak2/engine/ai/enemy.gc +++ b/goal_src/jak2/engine/ai/enemy.gc @@ -24,15 +24,11 @@ ) ) -;; WARN: Return type mismatch process-focusable vs enemy. (defmethod relocate enemy ((this enemy) (arg0 int)) (if (nonzero? (-> this neck)) (&+! (-> this neck) arg0) ) - (the-as - enemy - ((the-as (function process-focusable int process-focusable) (find-parent-method enemy 7)) this arg0) - ) + (call-parent-method this arg0) ) (defmethod get-rand-float enemy ((this enemy)) diff --git a/goal_src/jak2/engine/ambient/ambient.gc b/goal_src/jak2/engine/ambient/ambient.gc index bd26e93db0..1ad337542c 100644 --- a/goal_src/jak2/engine/ambient/ambient.gc +++ b/goal_src/jak2/engine/ambient/ambient.gc @@ -259,7 +259,7 @@ (defmethod deactivate talker ((this talker)) (send-event (handle->process (-> this voicebox)) 'die) - ((the-as (function process none) (find-parent-method talker 10)) this) + (call-parent-method this) (none) ) diff --git a/goal_src/jak2/engine/common_objs/collectables.gc b/goal_src/jak2/engine/common_objs/collectables.gc index 11e3799df1..2e860ddb1a 100644 --- a/goal_src/jak2/engine/common_objs/collectables.gc +++ b/goal_src/jak2/engine/common_objs/collectables.gc @@ -1231,7 +1231,7 @@ (if (not (logtest? (-> self fact options) (actor-option no-reaction))) (send-event (handle->process arg1) 'powerup (-> self fact pickup-type) (-> self fact pickup-amount)) ) - (let ((t9-2 (-> (the-as state (find-parent-method eco 26)) code))) + (let ((t9-2 (-> (the-as state (find-parent-state)) code))) (if t9-2 ((the-as (function none) t9-2)) ) @@ -1668,7 +1668,7 @@ This commonly includes things such as: (defmethod deactivate gem ((this gem)) (+! (-> *game-info* live-gem-count) -1) - ((the-as (function gem none) (find-parent-method gem 10)) this) + (call-parent-method this) (none) ) diff --git a/goal_src/jak2/engine/common_objs/conveyor.gc b/goal_src/jak2/engine/common_objs/conveyor.gc index d0fd988a80..05a04d0199 100644 --- a/goal_src/jak2/engine/common_objs/conveyor.gc +++ b/goal_src/jak2/engine/common_objs/conveyor.gc @@ -57,13 +57,9 @@ ) -;; WARN: Return type mismatch process-drawable vs conveyor. (defmethod relocate conveyor ((this conveyor) (new-addr int)) (&+! (-> this sections) new-addr) - (the-as - conveyor - ((the-as (function process-drawable int process-drawable) (find-parent-method conveyor 7)) this new-addr) - ) + (call-parent-method this new-addr) ) ;; WARN: Return type mismatch symbol vs art-group. diff --git a/goal_src/jak2/engine/common_objs/elevator.gc b/goal_src/jak2/engine/common_objs/elevator.gc index 8cf9853558..574095e093 100644 --- a/goal_src/jak2/engine/common_objs/elevator.gc +++ b/goal_src/jak2/engine/common_objs/elevator.gc @@ -760,12 +760,11 @@ For example for an elevator pre-compute the distance between the first and last (none) ) -;; WARN: Return type mismatch base-plat vs elevator. (defmethod relocate elevator ((this elevator) (arg0 int)) (if (nonzero? (-> this path-seq)) (&+! (-> this path-seq) arg0) ) - (the-as elevator ((the-as (function base-plat int base-plat) (find-parent-method elevator 7)) this arg0)) + (call-parent-method this arg0) ) (defmethod activate-elevator elevator ((this elevator)) diff --git a/goal_src/jak2/engine/common_objs/rigid-body-plat.gc b/goal_src/jak2/engine/common_objs/rigid-body-plat.gc index c6646fef32..843d2c9c90 100644 --- a/goal_src/jak2/engine/common_objs/rigid-body-plat.gc +++ b/goal_src/jak2/engine/common_objs/rigid-body-plat.gc @@ -73,18 +73,11 @@ ) -;; WARN: Return type mismatch rigid-body-object vs rigid-body-platform. (defmethod relocate rigid-body-platform ((this rigid-body-platform) (new-addr int)) (if (nonzero? (-> this control-point-array)) (&+! (-> this control-point-array) new-addr) ) - (the-as - rigid-body-platform - ((the-as (function rigid-body-object int rigid-body-object) (find-parent-method rigid-body-platform 7)) - this - new-addr - ) - ) + (call-parent-method this new-addr) ) (defmethod rigid-body-platform-method-53 rigid-body-platform ((this rigid-body-platform) (arg0 vector)) diff --git a/goal_src/jak2/engine/common_objs/water-anim.gc b/goal_src/jak2/engine/common_objs/water-anim.gc index eb05d42105..91e5ad2986 100644 --- a/goal_src/jak2/engine/common_objs/water-anim.gc +++ b/goal_src/jak2/engine/common_objs/water-anim.gc @@ -45,7 +45,7 @@ (if (nonzero? (-> this flow)) (&+! (-> this flow) arg0) ) - ((the-as (function water-anim int water-anim) (find-parent-method water-anim 7)) this arg0) + (call-parent-method this arg0) ) (defskelgroup skel-water-anim-nest-dark-eco-largepool water-anim-nest-dark-eco water-anim-nest-dark-eco-largepool-lod0-jg -1 diff --git a/goal_src/jak2/engine/common_objs/water-flow.gc b/goal_src/jak2/engine/common_objs/water-flow.gc index 5737f0c52f..f5ba23f9e5 100644 --- a/goal_src/jak2/engine/common_objs/water-flow.gc +++ b/goal_src/jak2/engine/common_objs/water-flow.gc @@ -68,7 +68,7 @@ (if (nonzero? (-> this path)) (&+! (-> this path) arg0) ) - ((the-as (function flow-control int flow-control) (find-parent-method flow-control 7)) this arg0) + (call-parent-method this arg0) ) (defmethod draw-path flow-control ((this flow-control)) diff --git a/goal_src/jak2/engine/debug/editable.gc b/goal_src/jak2/engine/debug/editable.gc index c8da3fdb03..d8580ae071 100644 --- a/goal_src/jak2/engine/debug/editable.gc +++ b/goal_src/jak2/engine/debug/editable.gc @@ -736,10 +736,7 @@ ) ) ) - ((the-as (function editable-point editable-command none) (find-parent-method editable-point 28)) - this - (the-as editable-command arg0) - ) + (call-parent-method this arg0) 0 (none) ) @@ -1038,7 +1035,7 @@ ;; WARN: Function (method 25 editable-light) has a return type of none, but the expression builder found a return statement. (defmethod editable-method-25 editable-light ((this editable-light) (arg0 editable-array)) - ((the-as (function editable-light editable-array none) (find-parent-method editable-light 25)) this arg0) + (call-parent-method this arg0) (when (nonzero? (-> this id)) (let ((s5-1 (clear *temp-string*))) (format s5-1 "delete from light where light_id=~D" (-> this id)) @@ -1203,7 +1200,7 @@ (set! (-> s3-0 owner) (delete! this (-> s3-0 owner))) ) ) - ((the-as (function editable-face editable-array none) (find-parent-method editable-face 25)) this arg0) + (call-parent-method this arg0) (none) ) @@ -1231,13 +1228,7 @@ ;; WARN: Return type mismatch editable-face vs editable. (defmethod editable-method-27 editable-face ((this editable-face) (arg0 editable-array)) - (let ((gp-1 - (the-as - editable-face - ((the-as (function editable-face editable-array editable) (find-parent-method editable-face 27)) this arg0) - ) - ) - ) + (let ((gp-1 (the-as editable-face (call-parent-method this arg0)))) (dotimes (s4-0 (-> gp-1 length)) (set! (-> gp-1 vertex s4-0) (the-as editable-point (editable-method-27 (-> gp-1 vertex s4-0) arg0))) (set! (-> gp-1 vertex s4-0 owner) (cons gp-1 (-> gp-1 vertex s4-0 owner))) diff --git a/goal_src/jak2/engine/debug/nav/nav-graph-editor.gc b/goal_src/jak2/engine/debug/nav/nav-graph-editor.gc index 4a5d9f595f..49962abe95 100644 --- a/goal_src/jak2/engine/debug/nav/nav-graph-editor.gc +++ b/goal_src/jak2/engine/debug/nav/nav-graph-editor.gc @@ -162,12 +162,8 @@ (none) ) -;; WARN: Return type mismatch none vs nav-graph-editor. (defmethod relocate nav-graph-editor ((this nav-graph-editor) (arg0 int)) - (the-as - nav-graph-editor - ((the-as (function process int none) (find-parent-method nav-graph-editor 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; WARN: Return type mismatch symbol vs none. diff --git a/goal_src/jak2/engine/game/task/task-control.gc b/goal_src/jak2/engine/game/task/task-control.gc index 71512ae21b..2a12574afb 100644 --- a/goal_src/jak2/engine/game/task/task-control.gc +++ b/goal_src/jak2/engine/game/task/task-control.gc @@ -1683,7 +1683,6 @@ ) ) -;; WARN: Return type mismatch process vs none. (defmethod deactivate fail-mission ((this fail-mission)) (set-filter-color! 1.0 1.0 1.0) (sound-group-continue (sound-group sfx music dialog sog3 ambient dialog2 sog6 sog7)) @@ -1691,7 +1690,7 @@ (update-rates! (-> *display* entity-clock) 1.0) (update-rates! (-> *display* target-clock) 1.0) (update-rates! (-> *display* camera-clock) 1.0) - ((the-as (function process process) (find-parent-method fail-mission 10)) this) + (call-parent-method this) (none) ) diff --git a/goal_src/jak2/engine/spatial-hash/spatial-hash.gc b/goal_src/jak2/engine/spatial-hash/spatial-hash.gc index 81084d1fad..4e7571235b 100644 --- a/goal_src/jak2/engine/spatial-hash/spatial-hash.gc +++ b/goal_src/jak2/engine/spatial-hash/spatial-hash.gc @@ -735,7 +735,7 @@ (defmethod dump-grid-info sphere-hash ((this sphere-hash)) "Prints out info about the grid-hash, also draws via [[grid-hash::draw-grid]] if `debug-draw` is `#t`" - ((the (function sphere-hash none) (find-parent-method sphere-hash 15)) this) + (call-parent-method this) (new 'stack-no-clear 'vector) (let ((f30-0 6144.0)) (set! (-> this work temp-box-min quad) (-> (target-pos 0) quad)) diff --git a/goal_src/jak2/engine/target/logic-target.gc b/goal_src/jak2/engine/target/logic-target.gc index 5f6306022a..5cdbd83930 100644 --- a/goal_src/jak2/engine/target/logic-target.gc +++ b/goal_src/jak2/engine/target/logic-target.gc @@ -3310,7 +3310,7 @@ ) (set! (-> *setting-control* cam-default mode-name) #f) (set-zero! *camera-smush-control*) - ((the-as (function target none) (find-parent-method target 10)) this) + (call-parent-method this) (none) ) diff --git a/goal_src/jak2/engine/ui/progress/progress.gc b/goal_src/jak2/engine/ui/progress/progress.gc index 4ba6329a89..32a2d8cab0 100644 --- a/goal_src/jak2/engine/ui/progress/progress.gc +++ b/goal_src/jak2/engine/ui/progress/progress.gc @@ -54,7 +54,7 @@ (stereo-mode-backup int32 :offset-assert 216) (secrets-unlocked symbol :offset-assert 220) (missions-total-spacing float :offset-assert 224) - (clear-screen symbol :offset-assert 228) + (clear-screen symbol :offset-assert 228) ) :method-count-assert 9 :size-assert #xe8 @@ -470,7 +470,7 @@ (enable-level-text-file-loading) (persist-with-delay *setting-control* 'allow-progress (seconds 0.1) 'allow-progress #f 0.0 0) (persist-with-delay *setting-control* 'allow-pause (seconds 0.1) 'allow-pause #f 0.0 0) - ((the-as (function progress none) (find-parent-method progress 10)) this) + (call-parent-method this) (none) ) diff --git a/goal_src/jak2/levels/atoll/atoll-obs.gc b/goal_src/jak2/levels/atoll/atoll-obs.gc index 9db0f871cc..d93c684333 100644 --- a/goal_src/jak2/levels/atoll/atoll-obs.gc +++ b/goal_src/jak2/levels/atoll/atoll-obs.gc @@ -805,21 +805,17 @@ This commonly includes things such as: (defmethod deactivate slider ((this slider)) (sound-stop (the-as sound-id (-> this sound-id))) - ((the-as (function process-drawable none) (find-parent-method slider 10)) this) + (call-parent-method this) (none) ) -;; WARN: Return type mismatch process-drawable vs slider. (defmethod relocate slider ((this slider) (arg0 int)) (dotimes (v1-0 4) (if (nonzero? (-> this l-bolts v1-0)) (&+! (-> this l-bolts v1-0) arg0) ) ) - (the-as - slider - ((the-as (function process-drawable int process-drawable) (find-parent-method slider 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/atoll/juicer.gc b/goal_src/jak2/levels/atoll/juicer.gc index 3d3dcb6900..a86e9a68ce 100644 --- a/goal_src/jak2/levels/atoll/juicer.gc +++ b/goal_src/jak2/levels/atoll/juicer.gc @@ -1738,7 +1738,6 @@ (none) ) -;; WARN: Return type mismatch process-focusable vs juicer. (defmethod relocate juicer ((this juicer) (arg0 int)) (if (nonzero? (-> this intro-path)) (&+! (-> this intro-path) arg0) @@ -1746,10 +1745,7 @@ (if (nonzero? (-> this joint)) (&+! (-> this joint) arg0) ) - (the-as - juicer - ((the-as (function process-focusable int process-focusable) (find-parent-method juicer 7)) this arg0) - ) + (call-parent-method this arg0) ) (defmethod init-enemy! juicer ((this juicer)) diff --git a/goal_src/jak2/levels/castle/boss/castle-baron.gc b/goal_src/jak2/levels/castle/boss/castle-baron.gc index 2399aef37c..6cdf73479f 100644 --- a/goal_src/jak2/levels/castle/boss/castle-baron.gc +++ b/goal_src/jak2/levels/castle/boss/castle-baron.gc @@ -110,7 +110,7 @@ This commonly includes things such as: (defmethod deactivate cboss-elevator ((this cboss-elevator)) (sound-stop (-> this sound-id)) - ((the-as (function process-drawable none) (find-parent-method cboss-elevator 10)) this) + (call-parent-method this) (none) ) @@ -1353,7 +1353,7 @@ For example for an elevator pre-compute the distance between the first and last (defmethod init-proj-settings! krew-boss-shot ((this krew-boss-shot)) "Init relevant settings for the [[projectile]] such as gravity, speed, timeout, etc" - ((the-as (function projectile none) (find-parent-method krew-boss-shot 31)) this) + (call-parent-method this) (set! (-> this move) krew-boss-shot-move) (set! (-> this max-speed) 245760.0) (set! (-> this timeout) (seconds 5)) diff --git a/goal_src/jak2/levels/castle/castle-obs.gc b/goal_src/jak2/levels/castle/castle-obs.gc index 348d55296e..79b31c7263 100644 --- a/goal_src/jak2/levels/castle/castle-obs.gc +++ b/goal_src/jak2/levels/castle/castle-obs.gc @@ -79,7 +79,7 @@ This commonly includes things such as: (defmethod deactivate cas-conveyor ((this cas-conveyor)) (sound-stop (-> this sound-id)) - ((the-as (function conveyor none) (find-parent-method cas-conveyor 10)) this) + (call-parent-method this) (none) ) @@ -935,7 +935,7 @@ This commonly includes things such as: (defmethod deactivate cas-elevator ((this cas-elevator)) (sound-stop (-> this sound-id)) - ((the-as (function elevator none) (find-parent-method cas-elevator 10)) this) + (call-parent-method this) (none) ) @@ -1987,7 +1987,7 @@ This commonly includes things such as: (defmethod deactivate cas-rot-blade ((this cas-rot-blade)) (sound-stop (-> this sound-id)) - ((the-as (function process-drawable none) (find-parent-method cas-rot-blade 10)) this) + (call-parent-method this) (none) ) diff --git a/goal_src/jak2/levels/castle/pad/caspad-obs.gc b/goal_src/jak2/levels/castle/pad/caspad-obs.gc index c56edebe07..1a4b87f6e8 100644 --- a/goal_src/jak2/levels/castle/pad/caspad-obs.gc +++ b/goal_src/jak2/levels/castle/pad/caspad-obs.gc @@ -152,7 +152,7 @@ (defmethod deactivate cpad-elevator ((this cpad-elevator)) (sound-stop (-> this sound-id)) - ((the-as (function elevator none) (find-parent-method cpad-elevator 10)) this) + (call-parent-method this) (none) ) diff --git a/goal_src/jak2/levels/castle/roboguard-level.gc b/goal_src/jak2/levels/castle/roboguard-level.gc index 2d27093fca..41cf8afbdf 100644 --- a/goal_src/jak2/levels/castle/roboguard-level.gc +++ b/goal_src/jak2/levels/castle/roboguard-level.gc @@ -334,9 +334,9 @@ (defstate ambush (roboguard-level) :virtual #t :enter (behavior () - (let ((t9-1 (-> (the-as state (find-parent-method roboguard-level 44)) enter))) + (let ((t9-1 (-> (find-parent-state) enter))) (if t9-1 - ((the-as (function none) t9-1)) + (t9-1) ) ) (logand! (-> self flags) -9) @@ -402,9 +402,9 @@ (defstate idle (roboguard-level) :virtual #t :enter (behavior () - (let ((t9-1 (-> (the-as state (find-parent-method roboguard-level 31)) enter))) + (let ((t9-1 (-> (find-parent-state) enter))) (if t9-1 - ((the-as (function none) t9-1)) + (t9-1) ) ) (roboguard-level-method-185 self (the-as symbol 0)) @@ -490,9 +490,9 @@ (defstate stare (roboguard-level) :virtual #t :enter (behavior () - (let ((t9-1 (-> (the-as state (find-parent-method roboguard-level 35)) enter))) + (let ((t9-1 (-> (find-parent-state) enter))) (if t9-1 - ((the-as (function none) t9-1)) + (t9-1) ) ) (roboguard-level-method-185 self (the-as symbol 0)) @@ -753,9 +753,9 @@ (defstate die (roboguard-level) :virtual #t :enter (behavior () - (let ((t9-1 (-> (the-as state (find-parent-method roboguard-level 38)) enter))) + (let ((t9-1 (-> (find-parent-state) enter))) (if t9-1 - ((the-as (function none) t9-1)) + (t9-1) ) ) (roboguard-level-method-185 self (the-as symbol 0)) @@ -1186,16 +1186,12 @@ (defmethod deactivate roboguard-level ((this roboguard-level)) (sound-stop (-> this roll-sound)) - ((the-as (function nav-enemy none) (find-parent-method roboguard-level 10)) this) + (call-parent-method this) (none) ) -;; WARN: Return type mismatch nav-enemy vs roboguard-level. (defmethod relocate roboguard-level ((this roboguard-level) (arg0 int)) - (the-as - roboguard-level - ((the-as (function nav-enemy int nav-enemy) (find-parent-method roboguard-level 7)) this arg0) - ) + (call-parent-method this arg0) ) (defmethod init-enemy-collision! roboguard-level ((this roboguard-level)) diff --git a/goal_src/jak2/levels/city/bombbot/bombbot.gc b/goal_src/jak2/levels/city/bombbot/bombbot.gc index 18d096f405..8e9b8c6dd6 100644 --- a/goal_src/jak2/levels/city/bombbot/bombbot.gc +++ b/goal_src/jak2/levels/city/bombbot/bombbot.gc @@ -2163,7 +2163,6 @@ ) ) -;; WARN: Return type mismatch nav-enemy vs bombbot. (defmethod relocate bombbot ((this bombbot) (arg0 int)) (dotimes (v1-0 4) (if (nonzero? (-> this joint-ik v1-0)) @@ -2173,7 +2172,7 @@ (if (nonzero? (-> this rigidbody)) (&+! (-> this rigidbody) arg0) ) - (the-as bombbot ((the-as (function nav-enemy int nav-enemy) (find-parent-method bombbot 7)) this arg0)) + (call-parent-method this arg0) ) (defmethod init-enemy-collision! bombbot ((this bombbot)) diff --git a/goal_src/jak2/levels/city/ctywide-obs.gc b/goal_src/jak2/levels/city/ctywide-obs.gc index 5828a1e418..4a08280009 100644 --- a/goal_src/jak2/levels/city/ctywide-obs.gc +++ b/goal_src/jak2/levels/city/ctywide-obs.gc @@ -2019,7 +2019,6 @@ This commonly includes things such as: ) ) -;; WARN: Return type mismatch process-focusable vs cty-guard-turret. (defmethod relocate cty-guard-turret ((this cty-guard-turret) (arg0 int)) (if (nonzero? (-> this jm-turret)) (&+! (-> this jm-turret) arg0) @@ -2030,13 +2029,7 @@ This commonly includes things such as: (if (nonzero? (-> this jm-gunsR)) (&+! (-> this jm-gunsR) arg0) ) - (the-as - cty-guard-turret - ((the-as (function process-focusable int process-focusable) (find-parent-method cty-guard-turret 7)) - this - arg0 - ) - ) + (call-parent-method this arg0) ) (defmethod cty-guard-turret-method-32 cty-guard-turret ((this cty-guard-turret)) @@ -3927,7 +3920,6 @@ This commonly includes things such as: (none) ) -;; WARN: Return type mismatch process-drawable vs barons-ship-lores. (defmethod relocate barons-ship-lores ((this barons-ship-lores) (arg0 int)) (if (nonzero? (-> this paths 0)) (&+! (-> this paths 0) arg0) @@ -3938,10 +3930,7 @@ This commonly includes things such as: (if (nonzero? (-> this paths 2)) (&+! (-> this paths 2) arg0) ) - (the-as - barons-ship-lores - ((the-as (function process-drawable int process-drawable) (find-parent-method barons-ship-lores 7)) this arg0) - ) + (call-parent-method this arg0) ) (defstate idle (barons-ship-lores) diff --git a/goal_src/jak2/levels/city/traffic/citizen/guard.gc b/goal_src/jak2/levels/city/traffic/citizen/guard.gc index a565e26199..ef83e7aae1 100644 --- a/goal_src/jak2/levels/city/traffic/citizen/guard.gc +++ b/goal_src/jak2/levels/city/traffic/citizen/guard.gc @@ -3705,7 +3705,6 @@ (none) ) -;; WARN: Return type mismatch process-drawable vs crimson-guard. (defmethod relocate crimson-guard ((this crimson-guard) (arg0 int)) (if (nonzero? (-> this joint)) (&+! (-> this joint) arg0) @@ -3713,10 +3712,7 @@ (if (nonzero? (-> this l-control)) (&+! (-> this l-control) arg0) ) - (the-as - crimson-guard - ((the-as (function process-drawable int process-drawable) (find-parent-method crimson-guard 7)) this arg0) - ) + (call-parent-method this arg0) ) (defmethod init-enemy! crimson-guard ((this crimson-guard)) diff --git a/goal_src/jak2/levels/city/traffic/citizen/metalhead-predator.gc b/goal_src/jak2/levels/city/traffic/citizen/metalhead-predator.gc index 750a2dc3e8..3e8e6c775a 100644 --- a/goal_src/jak2/levels/city/traffic/citizen/metalhead-predator.gc +++ b/goal_src/jak2/levels/city/traffic/citizen/metalhead-predator.gc @@ -1096,15 +1096,8 @@ (none) ) -;; WARN: Return type mismatch process-drawable vs metalhead-predator. (defmethod relocate metalhead-predator ((this metalhead-predator) (arg0 int)) - (the-as - metalhead-predator - ((the-as (function process-drawable int process-drawable) (find-parent-method metalhead-predator 7)) - this - arg0 - ) - ) + (call-parent-method this arg0) ) (defmethod init-enemy! metalhead-predator ((this metalhead-predator)) diff --git a/goal_src/jak2/levels/city/traffic/vehicle/bike.gc b/goal_src/jak2/levels/city/traffic/vehicle/bike.gc index 3e32a5fff7..c681da46de 100644 --- a/goal_src/jak2/levels/city/traffic/vehicle/bike.gc +++ b/goal_src/jak2/levels/city/traffic/vehicle/bike.gc @@ -920,7 +920,7 @@ (defmethod do-engine-sounds bike-base ((this bike-base)) - ((the-as (function object none) (find-parent-method bike-base 36)) this) + (call-parent-method this) (when (logtest? (-> this flags) (rigid-body-object-flag player-driving)) (if (zero? (-> this roll-sound-id)) (set! (-> this roll-sound-id) (new-sound-id)) @@ -952,7 +952,7 @@ ) (defmethod draw-thrusters bike-base ((this bike-base)) - ((the-as (function object none) (find-parent-method bike-base 85)) this) + (call-parent-method this) (when (logtest? (-> this rbody state flags) (rigid-body-flag enable-physics)) (let ((s5-0 (new 'stack-no-clear 'inline-array 'matrix 3))) (let* ((v1-4 (the-as object (-> s5-0 0 vector 2))) @@ -1047,7 +1047,7 @@ (if (nonzero? (-> this brake-r)) (&+! (-> this brake-r) arg0) ) - ((the-as (function object int bikea) (find-parent-method bikea 7)) this arg0) + (call-parent-method this arg0) ) (defmethod allocate-and-init-cshape bikea ((this bikea)) @@ -1181,7 +1181,7 @@ (if (nonzero? (-> this flap-r)) (&+! (-> this flap-r) arg0) ) - ((the-as (function object int bikeb) (find-parent-method bikeb 7)) this arg0) + (call-parent-method this arg0) ) (defmethod allocate-and-init-cshape bikeb ((this bikeb)) @@ -1329,7 +1329,7 @@ (if (nonzero? (-> this spoiler-r)) (&+! (-> this spoiler-r) arg0) ) - ((the-as (function object int bikec) (find-parent-method bikec 7)) this arg0) + (call-parent-method this arg0) ) (defmethod allocate-and-init-cshape bikec ((this bikec)) @@ -1464,7 +1464,7 @@ (if (nonzero? (-> this turret-jm)) (&+! (-> this turret-jm) arg0) ) - ((the-as (function object int guard-bike) (find-parent-method guard-bike 7)) this arg0) + (call-parent-method this arg0) ) (defmethod start-jump guard-bike ((this guard-bike)) diff --git a/goal_src/jak2/levels/city/traffic/vehicle/car.gc b/goal_src/jak2/levels/city/traffic/vehicle/car.gc index fc52f261f4..115fb619ed 100644 --- a/goal_src/jak2/levels/city/traffic/vehicle/car.gc +++ b/goal_src/jak2/levels/city/traffic/vehicle/car.gc @@ -1170,7 +1170,7 @@ (if (nonzero? (-> this rudder-r)) (&+! (-> this rudder-r) arg0) ) - ((the-as (function object object cara) (find-parent-method cara 7)) this arg0) + (call-parent-method this arg0) ) (defmethod allocate-and-init-cshape cara ((this cara)) @@ -1310,7 +1310,7 @@ (if (nonzero? (-> this fin-rr)) (&+! (-> this fin-rr) arg0) ) - ((the-as (function object object carb) (find-parent-method carb 7)) this arg0) + (call-parent-method this arg0) ) (defmethod allocate-and-init-cshape carb ((this carb)) @@ -1427,7 +1427,6 @@ ) -;; WARN: Return type mismatch carb vs carc. (defmethod relocate carc ((this carc) (arg0 int)) (if (nonzero? (-> this steering-wheel)) (&+! (-> this steering-wheel) arg0) @@ -1450,7 +1449,7 @@ (if (nonzero? (-> this fin2-rr)) (&+! (-> this fin2-rr) arg0) ) - (the-as carc ((the-as (function object object carb) (find-parent-method carc 7)) this arg0)) + (call-parent-method this arg0) ) (defmethod allocate-and-init-cshape carc ((this carc)) @@ -1583,7 +1582,7 @@ (if (nonzero? (-> this turret-jm)) (&+! (-> this turret-jm) arg0) ) - ((the-as (function object object hellcat) (find-parent-method hellcat 7)) this arg0) + (call-parent-method this arg0) ) (defmethod allocate-and-init-cshape hellcat ((this hellcat)) diff --git a/goal_src/jak2/levels/city/traffic/vehicle/transport.gc b/goal_src/jak2/levels/city/traffic/vehicle/transport.gc index 2ce98bf2b5..ad7e77ed11 100644 --- a/goal_src/jak2/levels/city/traffic/vehicle/transport.gc +++ b/goal_src/jak2/levels/city/traffic/vehicle/transport.gc @@ -117,15 +117,11 @@ (none) ) -;; WARN: Return type mismatch process-drawable vs vehicle-turret. (defmethod relocate vehicle-turret ((this vehicle-turret) (arg0 int)) (if (nonzero? (-> this turret-jm)) (&+! (-> this turret-jm) arg0) ) - (the-as - vehicle-turret - ((the-as (function process-drawable int process-drawable) (find-parent-method vehicle-turret 7)) this arg0) - ) + (call-parent-method this arg0) ) (defmethod vehicle-turret-method-30 vehicle-turret ((this vehicle-turret)) @@ -271,7 +267,7 @@ (defmethod deactivate transport ((this transport)) (sound-stop (-> this ambient-sound-id)) - ((the-as (function process-drawable none) (find-parent-method transport 10)) this) + (call-parent-method this) (none) ) diff --git a/goal_src/jak2/levels/city/traffic/vehicle/vehicle-rider.gc b/goal_src/jak2/levels/city/traffic/vehicle/vehicle-rider.gc index 2e9353d780..b597fe7c9b 100644 --- a/goal_src/jak2/levels/city/traffic/vehicle/vehicle-rider.gc +++ b/goal_src/jak2/levels/city/traffic/vehicle/vehicle-rider.gc @@ -295,7 +295,7 @@ This commonly includes things such as: ) (defmethod vehicle-rider-method-33 citizen-norm-rider ((this citizen-norm-rider)) - ((the-as (function vehicle-rider none) (find-parent-method citizen-norm-rider 33)) this) + (call-parent-method this) (setup-masks (-> this draw) 0 -1) (setup-masks (-> this draw) 32 0) (cond @@ -394,7 +394,7 @@ This commonly includes things such as: ) (defmethod vehicle-rider-method-33 crimson-guard-rider ((this crimson-guard-rider)) - ((the-as (function vehicle-rider none) (find-parent-method crimson-guard-rider 33)) this) + (call-parent-method this) (setup-masks (-> this draw) 0 28) (setup-masks (-> this draw) 3 0) (if (logtest? (-> this flags) 4) diff --git a/goal_src/jak2/levels/city/traffic/vehicle/vehicle-util.gc b/goal_src/jak2/levels/city/traffic/vehicle/vehicle-util.gc index a45f78fb4f..6cd8b67b1f 100644 --- a/goal_src/jak2/levels/city/traffic/vehicle/vehicle-util.gc +++ b/goal_src/jak2/levels/city/traffic/vehicle/vehicle-util.gc @@ -152,7 +152,7 @@ (defmethod deactivate vehicle ((this vehicle)) (vehicle-method-110 this) - ((the-as (function rigid-body-object none) (find-parent-method vehicle 10)) this) + (call-parent-method this) (none) ) diff --git a/goal_src/jak2/levels/common/ai/ashelin/ash-shot.gc b/goal_src/jak2/levels/common/ai/ashelin/ash-shot.gc index 99fe11e689..511562af9e 100644 --- a/goal_src/jak2/levels/common/ai/ashelin/ash-shot.gc +++ b/goal_src/jak2/levels/common/ai/ashelin/ash-shot.gc @@ -369,7 +369,7 @@ (sound-play "ashelin-shot-hi") ) ((= v1-0 (projectile-options lose-altitude proj-options-2)) - ((the-as (function projectile projectile-options none) (find-parent-method ashelin-shot 28)) this arg0) + (call-parent-method this arg0) ) ) ) diff --git a/goal_src/jak2/levels/common/battle.gc b/goal_src/jak2/levels/common/battle.gc index 1f255f25c8..7b61072b6d 100644 --- a/goal_src/jak2/levels/common/battle.gc +++ b/goal_src/jak2/levels/common/battle.gc @@ -1159,7 +1159,7 @@ (when (handle->process v0-7) (set! (-> arg0 creature) v0-7) (set! (-> arg0 mode) (the-as uint 1)) - (set! (-> arg0 last-spawn-time) (current-time)) + (set-time! (-> arg0 last-spawn-time)) ) ) ) @@ -1197,10 +1197,10 @@ (let ((v1-5 (-> arg0 noticed-attack-time))) (cond ((zero? v1-5) - (set! (-> arg0 noticed-attack-time) (current-time)) + (set-time! (-> arg0 noticed-attack-time)) ) (else - (if (>= (- (current-time) v1-5) (the-as time-frame (-> arg0 notice-attack-delay))) + (if (time-elapsed? v1-5 (the-as time-frame (-> arg0 notice-attack-delay))) (logior! (-> arg0 flags) (battle-spawner-flags hit)) ) ) @@ -1387,7 +1387,7 @@ :virtual #t :event battle-event-handler :enter (behavior () - (set! (-> self state-time) (current-time)) + (set-time! (-> self state-time)) (let ((gp-0 (-> self on-notice))) (if gp-0 (script-eval (the-as pair gp-0) :vector (-> self root trans)) @@ -1467,10 +1467,10 @@ (let ((a1-14 (-> this jammed-starting-time))) (cond ((zero? (-> this jammed-starting-time)) - (set! (-> this jammed-starting-time) (current-time)) + (set-time! (-> this jammed-starting-time)) ) (else - (if (>= (- (current-time) a1-14) (seconds 3.5)) + (if (time-elapsed? a1-14 (seconds 3.5)) (logior! (-> this flags) (battle-flags no-spawner-block)) ) ) @@ -1488,23 +1488,23 @@ (< a0-4 (the-as int (-> this info desired-alive-count))) (< (-> this count) v1-4) ) - (when (>= (- (current-time) (-> this cant-spawn-time)) (the-as time-frame (-> this next-spawn-delay))) + (when (time-elapsed? (-> this cant-spawn-time) (the-as time-frame (-> this next-spawn-delay))) (let ((a1-29 (get-best-spawner this))) (cond (a1-29 (spawn-from-spawner this a1-29 #f) (set! (-> this next-spawn-delay) (the-as uint (get-spawn-delay this))) - (set! (-> this cant-spawn-time) (current-time)) + (set-time! (-> this cant-spawn-time)) ) (else - (set! (-> this cant-spawn-time) (current-time)) + (set-time! (-> this cant-spawn-time)) ) ) ) ) ) (else - (set! (-> this cant-spawn-time) (current-time)) + (set-time! (-> this cant-spawn-time)) ) ) ) @@ -1516,7 +1516,7 @@ :virtual #t :event battle-event-handler :enter (behavior () - (set! (-> self state-time) (current-time)) + (set-time! (-> self state-time)) (logior! (-> self flags) (battle-flags active)) (logclear! (-> self flags) (battle-flags no-spawner-block)) (set! (-> self jammed-starting-time) 0) @@ -1594,14 +1594,10 @@ this ) -;; WARN: Return type mismatch process-drawable vs battle. (defmethod relocate battle ((this battle) (arg0 int)) (&+! (-> this spawners) arg0) (&+! (-> this allies) arg0) - (the-as - battle - ((the-as (function process-drawable int process-drawable) (find-parent-method battle 7)) this arg0) - ) + (call-parent-method this arg0) ) (defmethod initialize-spawner-breeds battle ((this battle) (arg0 battle-spawner) (arg1 entity-actor)) diff --git a/goal_src/jak2/levels/common/elec-gate.gc b/goal_src/jak2/levels/common/elec-gate.gc index cfeedf73f8..3bf51e543b 100644 --- a/goal_src/jak2/levels/common/elec-gate.gc +++ b/goal_src/jak2/levels/common/elec-gate.gc @@ -762,7 +762,7 @@ (defmethod deactivate elec-gate ((this elec-gate)) (set-elec-scale-if-close! this 0.0) - ((the-as (function process-drawable none) (find-parent-method elec-gate 10)) this) + (call-parent-method this) (none) ) diff --git a/goal_src/jak2/levels/common/enemy/centurion.gc b/goal_src/jak2/levels/common/enemy/centurion.gc index bd787f8e7a..d11f5c8e68 100644 --- a/goal_src/jak2/levels/common/enemy/centurion.gc +++ b/goal_src/jak2/levels/common/enemy/centurion.gc @@ -160,7 +160,7 @@ (sound-play "cent-shot-hit") ) ((= v1-0 (projectile-options lose-altitude proj-options-2)) - ((the-as (function projectile projectile-options sound-id) (find-parent-method centurion-shot 28)) this arg0) + (call-parent-method this arg0) ) ) ) @@ -170,7 +170,7 @@ (defmethod init-proj-settings! centurion-shot ((this centurion-shot)) "Init relevant settings for the [[projectile]] such as gravity, speed, timeout, etc" - ((the-as (function projectile none) (find-parent-method centurion-shot 31)) this) + (call-parent-method this) (set! (-> this max-speed) 327680.0) (set! (-> this timeout) (seconds 1.25)) (none) @@ -887,7 +887,7 @@ (defmethod dispose! centurion ((this centurion)) "Cleans-up the enemy and any associated resources. Potentially spawns skull gems" (play-communicator-speech! (-> *talker-speech* 58)) - ((the-as (function enemy none) (find-parent-method centurion 132)) this) + (call-parent-method this) (none) ) @@ -1486,15 +1486,11 @@ (none) ) -;; WARN: Return type mismatch process-focusable vs centurion. (defmethod relocate centurion ((this centurion) (arg0 int)) (if (nonzero? (-> this joint)) (&+! (-> this joint) arg0) ) - (the-as - centurion - ((the-as (function process-focusable int process-focusable) (find-parent-method centurion 7)) this arg0) - ) + (call-parent-method this arg0) ) (defmethod init-enemy! centurion ((this centurion)) diff --git a/goal_src/jak2/levels/common/enemy/flitter.gc b/goal_src/jak2/levels/common/enemy/flitter.gc index 83d3cdef20..2546ab88c3 100644 --- a/goal_src/jak2/levels/common/enemy/flitter.gc +++ b/goal_src/jak2/levels/common/enemy/flitter.gc @@ -1248,7 +1248,7 @@ (logior! (-> this minimap flags) (minimap-flag fade-out)) (set! (-> this minimap) #f) ) - ((the-as (function nav-enemy none) (find-parent-method flitter 132)) this) + (call-parent-method this) (none) ) diff --git a/goal_src/jak2/levels/common/enemy/fodder/fodder.gc b/goal_src/jak2/levels/common/enemy/fodder/fodder.gc index 78b5215f19..5c4baddd6b 100644 --- a/goal_src/jak2/levels/common/enemy/fodder/fodder.gc +++ b/goal_src/jak2/levels/common/enemy/fodder/fodder.gc @@ -1032,7 +1032,6 @@ (none) ) -;; WARN: Return type mismatch nav-enemy vs fodder. (defmethod relocate fodder ((this fodder) (arg0 int)) (if (nonzero? (-> this left-eye)) (&+! (-> this left-eye) arg0) @@ -1040,7 +1039,7 @@ (if (nonzero? (-> this right-eye)) (&+! (-> this right-eye) arg0) ) - (the-as fodder ((the-as (function nav-enemy int nav-enemy) (find-parent-method fodder 7)) this arg0)) + (call-parent-method this arg0) ) (defun fodder-setup-eye-control ((arg0 joint-mod)) diff --git a/goal_src/jak2/levels/common/enemy/grenadier.gc b/goal_src/jak2/levels/common/enemy/grenadier.gc index dcc17c9271..a51027a593 100644 --- a/goal_src/jak2/levels/common/enemy/grenadier.gc +++ b/goal_src/jak2/levels/common/enemy/grenadier.gc @@ -1245,7 +1245,6 @@ (none) ) -;; WARN: Return type mismatch process-focusable vs grenadier. (defmethod relocate grenadier ((this grenadier) (arg0 int)) (if (nonzero? (-> this joint)) (&+! (-> this joint) arg0) @@ -1255,10 +1254,7 @@ (&+! (-> this hostile-path) arg0) ) ) - (the-as - grenadier - ((the-as (function process-focusable int process-focusable) (find-parent-method grenadier 7)) this arg0) - ) + (call-parent-method this arg0) ) (defmethod init-enemy! grenadier ((this grenadier)) diff --git a/goal_src/jak2/levels/common/enemy/grunt.gc b/goal_src/jak2/levels/common/enemy/grunt.gc index 43bb20ad6a..8bf3f444b5 100644 --- a/goal_src/jak2/levels/common/enemy/grunt.gc +++ b/goal_src/jak2/levels/common/enemy/grunt.gc @@ -1409,7 +1409,7 @@ (logior! (-> this minimap flags) (minimap-flag fade-out)) (set! (-> this minimap) #f) ) - ((the-as (function nav-enemy none) (find-parent-method grunt 132)) this) + (call-parent-method this) (none) ) diff --git a/goal_src/jak2/levels/common/enemy/guards/crimson-guard-level.gc b/goal_src/jak2/levels/common/enemy/guards/crimson-guard-level.gc index dcf8af3b74..bd07fad212 100644 --- a/goal_src/jak2/levels/common/enemy/guards/crimson-guard-level.gc +++ b/goal_src/jak2/levels/common/enemy/guards/crimson-guard-level.gc @@ -4151,7 +4151,6 @@ (none) ) -;; WARN: Return type mismatch nav-enemy vs crimson-guard-level. (defmethod relocate crimson-guard-level ((this crimson-guard-level) (arg0 int)) (if (nonzero? (-> this joint)) (&+! (-> this joint) arg0) @@ -4159,10 +4158,7 @@ (if (nonzero? (-> this l-control)) (&+! (-> this l-control) arg0) ) - (the-as - crimson-guard-level - ((the-as (function nav-enemy int nav-enemy) (find-parent-method crimson-guard-level 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; WARN: Return type mismatch float vs none. diff --git a/goal_src/jak2/levels/common/enemy/hopper.gc b/goal_src/jak2/levels/common/enemy/hopper.gc index e4587ca2d4..7ac20a23dc 100644 --- a/goal_src/jak2/levels/common/enemy/hopper.gc +++ b/goal_src/jak2/levels/common/enemy/hopper.gc @@ -919,19 +919,15 @@ (logior! (-> this minimap flags) (minimap-flag fade-out)) (set! (-> this minimap) #f) ) - ((the-as (function enemy none) (find-parent-method hopper 132)) this) + (call-parent-method this) (none) ) -;; WARN: Return type mismatch process-focusable vs hopper. (defmethod relocate hopper ((this hopper) (arg0 int)) (if (nonzero? (-> this path-intro)) (&+! (-> this path-intro) arg0) ) - (the-as - hopper - ((the-as (function process-focusable int process-focusable) (find-parent-method hopper 7)) this arg0) - ) + (call-parent-method this arg0) ) (defmethod init-enemy-collision! hopper ((this hopper)) diff --git a/goal_src/jak2/levels/common/enemy/hover/crimson-guard-hover.gc b/goal_src/jak2/levels/common/enemy/hover/crimson-guard-hover.gc index 9ca1720be9..971ebeaf15 100644 --- a/goal_src/jak2/levels/common/enemy/hover/crimson-guard-hover.gc +++ b/goal_src/jak2/levels/common/enemy/hover/crimson-guard-hover.gc @@ -593,7 +593,7 @@ (defmethod enemy-method-135 crimson-guard-hover ((this crimson-guard-hover) (arg0 int)) (if (and (zero? arg0) (logtest? #x4000000 (-> this incoming penetrate-using))) (sound-play "hover-take-hit") - ((the-as (function enemy int sound-id) (find-parent-method crimson-guard-hover 135)) this arg0) + (call-parent-method this arg0) ) (the-as sound-id 0) ) @@ -913,7 +913,7 @@ (defstate knocked (crimson-guard-hover) :virtual #t :enter (behavior () - (let ((t9-1 (-> (the-as (state hover-enemy) (find-parent-method crimson-guard-hover 30)) enter))) + (let ((t9-1 (-> (find-parent-state) enter))) (if t9-1 (t9-1) ) @@ -987,7 +987,7 @@ (defstate flying-death (crimson-guard-hover) :virtual #t :enter (behavior () - (let ((t9-1 (-> (the-as (state hover-enemy) (find-parent-method crimson-guard-hover 138)) enter))) + (let ((t9-1 (-> (find-parent-state) enter))) (if t9-1 (t9-1) ) @@ -1048,7 +1048,7 @@ (defstate flying-death-explode (crimson-guard-hover) :virtual #t :enter (behavior () - (let ((t9-1 (-> (the-as (state hover-enemy) (find-parent-method crimson-guard-hover 139)) enter))) + (let ((t9-1 (-> (find-parent-state) enter))) (if t9-1 (t9-1) ) @@ -1144,16 +1144,7 @@ ) ) ) - ((the-as - (function enemy process int symbol event-message-block object) - (find-parent-method crimson-guard-hover 74) - ) - this - arg0 - arg1 - arg2 - arg3 - ) + (call-parent-method this arg0 arg1 arg2 arg3) ) (('notify) (let ((a0-27 (the-as object (-> arg3 param 0))) @@ -1173,28 +1164,10 @@ ) ) ) - ((the-as - (function enemy process int symbol event-message-block object) - (find-parent-method crimson-guard-hover 74) - ) - this - arg0 - arg1 - arg2 - arg3 - ) + (call-parent-method this arg0 arg1 arg2 arg3) ) (else - ((the-as - (function enemy process int symbol event-message-block object) - (find-parent-method crimson-guard-hover 74) - ) - this - arg0 - arg1 - arg2 - arg3 - ) + (call-parent-method this arg0 arg1 arg2 arg3) ) ) ) @@ -1289,7 +1262,7 @@ ) ) (else - ((the-as (function hover-enemy vector none) (find-parent-method crimson-guard-hover 52)) this arg0) + (call-parent-method this arg0) ) ) ) diff --git a/goal_src/jak2/levels/common/enemy/hover/flamer.gc b/goal_src/jak2/levels/common/enemy/hover/flamer.gc index 3a3ce7d9dc..d61c2bff94 100644 --- a/goal_src/jak2/levels/common/enemy/hover/flamer.gc +++ b/goal_src/jak2/levels/common/enemy/hover/flamer.gc @@ -1395,15 +1395,11 @@ (none) ) -;; WARN: Return type mismatch process-drawable vs flamer. (defmethod relocate flamer ((this flamer) (arg0 int)) (if (nonzero? (-> this flit-joint)) (&+! (-> this flit-joint) arg0) ) - (the-as - flamer - ((the-as (function process-drawable int process-drawable) (find-parent-method flamer 7)) this arg0) - ) + (call-parent-method this arg0) ) (defmethod init-enemy! flamer ((this flamer)) diff --git a/goal_src/jak2/levels/common/enemy/hover/hover-enemy-battle.gc b/goal_src/jak2/levels/common/enemy/hover/hover-enemy-battle.gc index 5d461f39f1..158e8121ed 100644 --- a/goal_src/jak2/levels/common/enemy/hover/hover-enemy-battle.gc +++ b/goal_src/jak2/levels/common/enemy/hover/hover-enemy-battle.gc @@ -247,7 +247,6 @@ (none) ) -;; WARN: Return type mismatch process vs hover-enemy-manager. (defmethod relocate hover-enemy-manager ((this hover-enemy-manager) (arg0 int)) (when (-> this formation) (if (nonzero? (-> this formation)) @@ -257,10 +256,7 @@ (if (nonzero? (-> this path)) (&+! (-> this path) arg0) ) - (the-as - hover-enemy-manager - ((the-as (function process int process) (find-parent-method hover-enemy-manager 7)) this arg0) - ) + (call-parent-method this arg0) ) (defmethod hover-enemy-manager-init! hover-enemy-manager ((this hover-enemy-manager) (arg0 (array hover-enemy-battle-command))) diff --git a/goal_src/jak2/levels/common/enemy/hover/hover-enemy.gc b/goal_src/jak2/levels/common/enemy/hover/hover-enemy.gc index 31e493eeaf..42fd06991d 100644 --- a/goal_src/jak2/levels/common/enemy/hover/hover-enemy.gc +++ b/goal_src/jak2/levels/common/enemy/hover/hover-enemy.gc @@ -605,7 +605,7 @@ (set! (-> self knocked-start-level) (-> self root trans y)) ) :exit (behavior () - (let ((t9-1 (-> (the-as state (find-parent-method hover-enemy 30)) exit))) + (let ((t9-1 (-> (the-as state (find-parent-state)) exit))) (if t9-1 (t9-1) ) diff --git a/goal_src/jak2/levels/common/enemy/hover/hover-formation.gc b/goal_src/jak2/levels/common/enemy/hover/hover-formation.gc index 962ceda416..f85a2273cf 100644 --- a/goal_src/jak2/levels/common/enemy/hover/hover-formation.gc +++ b/goal_src/jak2/levels/common/enemy/hover/hover-formation.gc @@ -648,7 +648,6 @@ ) ) -;; WARN: Return type mismatch basic vs hover-formation. (defmethod relocate hover-formation ((this hover-formation) (arg0 int)) (if (nonzero? (-> this formation)) (&+! (-> this formation) arg0) @@ -656,10 +655,7 @@ (if (nonzero? (-> this path)) (&+! (-> this path) arg0) ) - (the-as - hover-formation - ((the-as (function basic int basic) (find-parent-method hover-formation 7)) this arg0) - ) + (call-parent-method this arg0) ) (defmethod hover-formation-method-15 hover-formation ((this hover-formation) (arg0 vector) (arg1 vector)) diff --git a/goal_src/jak2/levels/common/enemy/hover/wasp.gc b/goal_src/jak2/levels/common/enemy/hover/wasp.gc index 402c0ad344..d8971c637a 100644 --- a/goal_src/jak2/levels/common/enemy/hover/wasp.gc +++ b/goal_src/jak2/levels/common/enemy/hover/wasp.gc @@ -500,7 +500,7 @@ ) ) (else - ((the-as (function enemy vector none) (find-parent-method wasp 52)) this arg0) + (call-parent-method this arg0) ) ) ) diff --git a/goal_src/jak2/levels/common/enemy/metalmonk.gc b/goal_src/jak2/levels/common/enemy/metalmonk.gc index cdaa15d10f..eec7024413 100644 --- a/goal_src/jak2/levels/common/enemy/metalmonk.gc +++ b/goal_src/jak2/levels/common/enemy/metalmonk.gc @@ -1150,15 +1150,11 @@ #f ) -;; WARN: Return type mismatch process-focusable vs metalmonk. (defmethod relocate metalmonk ((this metalmonk) (arg0 int)) (if (nonzero? (-> this intro-path)) (&+! (-> this intro-path) arg0) ) - (the-as - metalmonk - ((the-as (function process-focusable int process-focusable) (find-parent-method metalmonk 7)) this arg0) - ) + (call-parent-method this arg0) ) (defmethod init-enemy! metalmonk ((this metalmonk)) diff --git a/goal_src/jak2/levels/common/enemy/spyder.gc b/goal_src/jak2/levels/common/enemy/spyder.gc index 654c33c243..e0ce458d8b 100644 --- a/goal_src/jak2/levels/common/enemy/spyder.gc +++ b/goal_src/jak2/levels/common/enemy/spyder.gc @@ -45,7 +45,7 @@ (defmethod init-proj-settings! spyder-shot ((this spyder-shot)) "Init relevant settings for the [[projectile]] such as gravity, speed, timeout, etc" - ((the-as (function projectile none) (find-parent-method spyder-shot 31)) this) + (call-parent-method this) (set! (-> this max-speed) 307200.0) (set! (-> this timeout) (seconds 0.267)) (none) @@ -1304,7 +1304,6 @@ (none) ) -;; WARN: Return type mismatch process-focusable vs spyder. (defmethod relocate spyder ((this spyder) (arg0 int)) (if (nonzero? (-> this joint)) (&+! (-> this joint) arg0) @@ -1314,10 +1313,7 @@ (&+! (-> this joint-ik v1-4) arg0) ) ) - (the-as - spyder - ((the-as (function process-focusable int process-focusable) (find-parent-method spyder 7)) this arg0) - ) + (call-parent-method this arg0) ) (defmethod init-enemy! spyder ((this spyder)) diff --git a/goal_src/jak2/levels/common/entities/com-elevator.gc b/goal_src/jak2/levels/common/entities/com-elevator.gc index 2cd9f01aae..a31e259cc4 100644 --- a/goal_src/jak2/levels/common/entities/com-elevator.gc +++ b/goal_src/jak2/levels/common/entities/com-elevator.gc @@ -97,9 +97,9 @@ (defstate dormant (com-elevator) :virtual #t :enter (behavior () - (let ((t9-1 (-> (the-as state (find-parent-method com-elevator 34)) enter))) + (let ((t9-1 (-> (find-parent-state) enter))) (if t9-1 - ((the-as (function none) t9-1)) + (t9-1) ) ) (process-entity-status! self (entity-perm-status subtask-complete) #t) @@ -179,7 +179,7 @@ (defmethod deactivate com-elevator ((this com-elevator)) (sound-stop (-> this sound-id)) - ((the-as (function elevator none) (find-parent-method com-elevator 10)) this) + (call-parent-method this) (none) ) @@ -312,7 +312,7 @@ For example for an elevator pre-compute the distance between the first and last (defmethod deactivate tomb-trans-elevator ((this tomb-trans-elevator)) (sound-stop (-> this sound-id)) - ((the-as (function com-elevator none) (find-parent-method tomb-trans-elevator 10)) this) + (call-parent-method this) (none) ) @@ -320,7 +320,7 @@ For example for an elevator pre-compute the distance between the first and last (defmethod init-plat! tomb-trans-elevator ((this tomb-trans-elevator)) "Does any necessary initial platform setup. For example for an elevator pre-compute the distance between the first and last points (both ways) and clear the sound." - ((the-as (function com-elevator none) (find-parent-method tomb-trans-elevator 33)) this) + (call-parent-method this) (set! (-> this sound-id) (new-sound-id)) (none) ) diff --git a/goal_src/jak2/levels/common/entities/spydroid.gc b/goal_src/jak2/levels/common/entities/spydroid.gc index f27ca182db..29c863bca6 100644 --- a/goal_src/jak2/levels/common/entities/spydroid.gc +++ b/goal_src/jak2/levels/common/entities/spydroid.gc @@ -1304,7 +1304,7 @@ (if (nonzero? (-> this explode-part)) (kill-and-free-particles (-> this explode-part)) ) - ((the-as (function process-focusable none) (find-parent-method spydroid 10)) this) + (call-parent-method this) (none) ) diff --git a/goal_src/jak2/levels/common/race/race-manager.gc b/goal_src/jak2/levels/common/race/race-manager.gc index 05f99ae762..92a34828c0 100644 --- a/goal_src/jak2/levels/common/race/race-manager.gc +++ b/goal_src/jak2/levels/common/race/race-manager.gc @@ -1566,7 +1566,7 @@ (defmethod deactivate race-manager ((this race-manager)) (persist-with-delay *setting-control* 'music-volume (seconds 3) 'music-volume 'abs 0.0 0) (send-event *traffic-manager* 'restore-default-settings) - ((the-as (function process none) (find-parent-method race-manager 10)) this) + (call-parent-method this) (none) ) diff --git a/goal_src/jak2/levels/common/scene-actor.gc b/goal_src/jak2/levels/common/scene-actor.gc index cde2fd9729..a9c104125d 100644 --- a/goal_src/jak2/levels/common/scene-actor.gc +++ b/goal_src/jak2/levels/common/scene-actor.gc @@ -688,7 +688,7 @@ This commonly includes things such as: ) ) ) - ((the-as (function process-taskable none) (find-parent-method youngsamos-npc 32)) this) + (call-parent-method this) (none) ) diff --git a/goal_src/jak2/levels/dig/dig-obs.gc b/goal_src/jak2/levels/dig/dig-obs.gc index 2da63616a5..ab01a2138d 100644 --- a/goal_src/jak2/levels/dig/dig-obs.gc +++ b/goal_src/jak2/levels/dig/dig-obs.gc @@ -30,7 +30,7 @@ ) (defmethod rigid-body-object-method-29 dig-sinking-plat ((this dig-sinking-plat) (arg0 float)) - ((the-as (function rigid-body-platform float none) (find-parent-method dig-sinking-plat 29)) this arg0) + (call-parent-method this arg0) (rigid-body-platform-method-56 this (-> this anchor-point)) 0 (none) diff --git a/goal_src/jak2/levels/dig/dig3-obs.gc b/goal_src/jak2/levels/dig/dig3-obs.gc index bec8cf180e..de520a2077 100644 --- a/goal_src/jak2/levels/dig/dig3-obs.gc +++ b/goal_src/jak2/levels/dig/dig3-obs.gc @@ -1403,7 +1403,7 @@ This commonly includes things such as: ) (defmethod rigid-body-object-method-29 dig-tipping-rock ((this dig-tipping-rock) (arg0 float)) - ((the-as (function rigid-body-platform float none) (find-parent-method dig-tipping-rock 29)) this arg0) + (call-parent-method this arg0) (rigid-body-platform-method-56 this (-> this anchor-point)) 0 (none) diff --git a/goal_src/jak2/levels/drill/drill-baron.gc b/goal_src/jak2/levels/drill/drill-baron.gc index 19904249c5..253418da9a 100644 --- a/goal_src/jak2/levels/drill/drill-baron.gc +++ b/goal_src/jak2/levels/drill/drill-baron.gc @@ -977,7 +977,6 @@ (none) ) -;; WARN: Return type mismatch process-drawable vs drill-barons-ship-turret. (defmethod relocate drill-barons-ship-turret ((this drill-barons-ship-turret) (arg0 int)) (when (-> this jmod) (if (nonzero? (-> this jmod)) @@ -994,13 +993,7 @@ (&+! (-> this jmod-right) arg0) ) ) - (the-as - drill-barons-ship-turret - ((the-as (function process-drawable int process-drawable) (find-parent-method drill-barons-ship-turret 7)) - this - arg0 - ) - ) + (call-parent-method this arg0) ) ;; WARN: Return type mismatch object vs none. @@ -1122,7 +1115,7 @@ This commonly includes things such as: (defmethod init-proj-settings! drill-ship-shot ((this drill-ship-shot)) "Init relevant settings for the [[projectile]] such as gravity, speed, timeout, etc" - ((the-as (function guard-shot none) (find-parent-method drill-ship-shot 31)) this) + (call-parent-method this) (set! (-> this attack-mode) 'drill-ship-shot) (set! (-> this move) guard-shot-move) (set! (-> this max-speed) 737280.0) diff --git a/goal_src/jak2/levels/drill/drill-obs.gc b/goal_src/jak2/levels/drill/drill-obs.gc index 57652064d9..d80d1f3ec7 100644 --- a/goal_src/jak2/levels/drill/drill-obs.gc +++ b/goal_src/jak2/levels/drill/drill-obs.gc @@ -460,7 +460,7 @@ This commonly includes things such as: (defmethod deactivate drill-elevator ((this drill-elevator)) (sound-stop (-> this sound-id)) - ((the-as (function process-drawable none) (find-parent-method drill-elevator 10)) this) + (call-parent-method this) (none) ) @@ -809,15 +809,11 @@ For example for an elevator pre-compute the distance between the first and last (none) ) -;; WARN: Return type mismatch process-drawable vs fire-floor. (defmethod relocate fire-floor ((this fire-floor) (arg0 int)) (if (nonzero? (-> this part-off)) (&+! (-> this part-off) arg0) ) - (the-as - fire-floor - ((the-as (function process-drawable int process-drawable) (find-parent-method fire-floor 7)) this arg0) - ) + (call-parent-method this arg0) ) (defmethod deactivate fire-floor ((this fire-floor)) @@ -825,7 +821,7 @@ For example for an elevator pre-compute the distance between the first and last (if (nonzero? (-> this part-off)) (kill-and-free-particles (-> this part-off)) ) - ((the-as (function process-drawable none) (find-parent-method fire-floor 10)) this) + (call-parent-method this) (none) ) diff --git a/goal_src/jak2/levels/drill/drillmid-obs.gc b/goal_src/jak2/levels/drill/drillmid-obs.gc index c4bba05e78..751b1b02a3 100644 --- a/goal_src/jak2/levels/drill/drillmid-obs.gc +++ b/goal_src/jak2/levels/drill/drillmid-obs.gc @@ -176,7 +176,7 @@ This commonly includes things such as: :exit (behavior () (sound-stop (-> self sound-id)) (sound-play "drl-elev-stop") - (let ((t9-4 (-> (the-as state (find-parent-method drill-lift 36)) exit))) + (let ((t9-4 (-> (find-parent-state) exit))) (if t9-4 (t9-4) ) @@ -184,7 +184,7 @@ This commonly includes things such as: ) :post (behavior () (sound-play "drl-elevator-lp" :id (-> self sound-id) :position (-> self root trans)) - (let ((t9-2 (-> (the-as state (find-parent-method drill-lift 36)) post))) + (let ((t9-2 (-> (the-as state (find-parent-state)) post))) (if t9-2 ((the-as (function none) t9-2)) ) diff --git a/goal_src/jak2/levels/drill/ginsu.gc b/goal_src/jak2/levels/drill/ginsu.gc index 3069c6f4b3..79de2f1e82 100644 --- a/goal_src/jak2/levels/drill/ginsu.gc +++ b/goal_src/jak2/levels/drill/ginsu.gc @@ -910,11 +910,9 @@ ) (defmethod deactivate ginsu ((this ginsu)) - (when (nonzero? (-> this blade-part)) - (let ((a0-1 (-> this blade-part))) - ((the-as (function sparticle-launch-control none) (method-of-object a0-1 kill-and-free-particles)) a0-1) + (if (nonzero? (-> this blade-part)) + (kill-and-free-particles (-> this blade-part)) ) - ) (if (-> this blade-sound-playing) (sound-stop (-> this blade-sound)) ) diff --git a/goal_src/jak2/levels/forest/forest-obs.gc b/goal_src/jak2/levels/forest/forest-obs.gc index b2d9b37fd8..e60ca21ca1 100644 --- a/goal_src/jak2/levels/forest/forest-obs.gc +++ b/goal_src/jak2/levels/forest/forest-obs.gc @@ -395,7 +395,7 @@ This commonly includes things such as: (send-event (handle->process (-> this hud)) 'hide-and-die) ) (sound-stop (-> this sound-id)) - ((the-as (function process-focusable none) (find-parent-method forest-youngsamos 10)) this) + (call-parent-method this) (none) ) diff --git a/goal_src/jak2/levels/forest/predator.gc b/goal_src/jak2/levels/forest/predator.gc index 4558721448..00c4ec9fac 100644 --- a/goal_src/jak2/levels/forest/predator.gc +++ b/goal_src/jak2/levels/forest/predator.gc @@ -1422,12 +1422,8 @@ (none) ) -;; WARN: Return type mismatch process-focusable vs predator. (defmethod relocate predator ((this predator) (arg0 int)) - (the-as - predator - ((the-as (function process-focusable int process-focusable) (find-parent-method predator 7)) this arg0) - ) + (call-parent-method this arg0) ) (defmethod nav-enemy-method-167 predator ((this predator)) diff --git a/goal_src/jak2/levels/forest/wren.gc b/goal_src/jak2/levels/forest/wren.gc index 0a2ab4a981..d81d0a6a3b 100644 --- a/goal_src/jak2/levels/forest/wren.gc +++ b/goal_src/jak2/levels/forest/wren.gc @@ -429,7 +429,6 @@ If so, it transitions from [[wren::peck]] to [[wren::hunt]]" ) ) -;; WARN: Return type mismatch process-drawable vs wren. (defmethod relocate wren ((this wren) (arg0 int)) (dotimes (v1-0 2) (when (-> this fly-curve v1-0) @@ -438,10 +437,7 @@ If so, it transitions from [[wren::peck]] to [[wren::hunt]]" ) ) ) - (the-as - wren - ((the-as (function process-drawable int process-drawable) (find-parent-method wren 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/fortress/dump/fordumpc-obs.gc b/goal_src/jak2/levels/fortress/dump/fordumpc-obs.gc index 34125059b2..0cb2e68d83 100644 --- a/goal_src/jak2/levels/fortress/dump/fordumpc-obs.gc +++ b/goal_src/jak2/levels/fortress/dump/fordumpc-obs.gc @@ -380,7 +380,7 @@ This commonly includes things such as: (defmethod deactivate fort-missile-target ((this fort-missile-target)) (sound-stop (the-as sound-id (-> this sound-id))) - ((the-as (function process-drawable none) (find-parent-method fort-missile-target 10)) this) + (call-parent-method this) (none) ) @@ -921,15 +921,11 @@ This commonly includes things such as: (none) ) -;; WARN: Return type mismatch process-drawable vs fort-missile. (defmethod relocate fort-missile ((this fort-missile) (arg0 int)) (if (nonzero? (-> this part-doom)) (&+! (-> this part-doom) arg0) ) - (the-as - fort-missile - ((the-as (function process-drawable int process-drawable) (find-parent-method fort-missile 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/fortress/dump/fort-robotank-turret.gc b/goal_src/jak2/levels/fortress/dump/fort-robotank-turret.gc index a4b0939fcf..e417a8373d 100644 --- a/goal_src/jak2/levels/fortress/dump/fort-robotank-turret.gc +++ b/goal_src/jak2/levels/fortress/dump/fort-robotank-turret.gc @@ -326,7 +326,7 @@ (defmethod deactivate fort-roboscreen ((this fort-roboscreen)) (disable *screen-filter*) (set-roboscreen-alpha! 0.0) - ((the-as (function process-drawable none) (find-parent-method fort-roboscreen 10)) this) + (call-parent-method this) (none) ) diff --git a/goal_src/jak2/levels/fortress/dump/fort-robotank.gc b/goal_src/jak2/levels/fortress/dump/fort-robotank.gc index 18d6304ba3..e830997aa9 100644 --- a/goal_src/jak2/levels/fortress/dump/fort-robotank.gc +++ b/goal_src/jak2/levels/fortress/dump/fort-robotank.gc @@ -940,7 +940,6 @@ (none) ) -;; WARN: Return type mismatch process-drawable vs fort-robotank. (defmethod relocate fort-robotank ((this fort-robotank) (arg0 int)) (if (nonzero? (-> this barrel-part)) (&+! (-> this barrel-part) arg0) @@ -989,10 +988,7 @@ ) ) ) - (the-as - fort-robotank - ((the-as (function process-drawable int process-drawable) (find-parent-method fort-robotank 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/fortress/rescue/forresca-obs.gc b/goal_src/jak2/levels/fortress/rescue/forresca-obs.gc index 204254c71d..c30cf59fe3 100644 --- a/goal_src/jak2/levels/fortress/rescue/forresca-obs.gc +++ b/goal_src/jak2/levels/fortress/rescue/forresca-obs.gc @@ -254,7 +254,7 @@ This commonly includes things such as: (defstate shutdown (elec-lock-gate) :virtual #t :enter (behavior () - (let ((t9-1 (-> (the-as state (find-parent-method elec-lock-gate 22)) enter))) + (let ((t9-1 (-> (the-as state (find-parent-state)) enter))) (if t9-1 ((the-as (function none) t9-1)) ) diff --git a/goal_src/jak2/levels/fortress/rescue/forrescb-obs.gc b/goal_src/jak2/levels/fortress/rescue/forrescb-obs.gc index 8fc4d09021..e5178ec585 100644 --- a/goal_src/jak2/levels/fortress/rescue/forrescb-obs.gc +++ b/goal_src/jak2/levels/fortress/rescue/forrescb-obs.gc @@ -391,7 +391,7 @@ This commonly includes things such as: (defmethod deactivate fort-elec-belt-inst ((this fort-elec-belt-inst)) (sound-stop (-> this sound-id)) - ((the-as (function process-drawable none) (find-parent-method fort-elec-belt-inst 10)) this) + (call-parent-method this) (none) ) diff --git a/goal_src/jak2/levels/gungame/gungame-obs.gc b/goal_src/jak2/levels/gungame/gungame-obs.gc index 7696aba2ea..8b3ddf8d56 100644 --- a/goal_src/jak2/levels/gungame/gungame-obs.gc +++ b/goal_src/jak2/levels/gungame/gungame-obs.gc @@ -149,7 +149,7 @@ ) (training-manager-method-24 this) (training-manager-method-25 this) - ((the-as (function process none) (find-parent-method training-manager 10)) this) + (call-parent-method this) (none) ) diff --git a/goal_src/jak2/levels/hiphog/whack.gc b/goal_src/jak2/levels/hiphog/whack.gc index c2fe211b87..d7b902533d 100644 --- a/goal_src/jak2/levels/hiphog/whack.gc +++ b/goal_src/jak2/levels/hiphog/whack.gc @@ -1697,21 +1697,17 @@ (kill-and-free-particles (-> this score-part s5-0)) ) ) - ((the-as (function process none) (find-parent-method whack-a-metal 10)) this) + (call-parent-method this) (none) ) -;; WARN: Return type mismatch process-drawable vs whack-a-metal. (defmethod relocate whack-a-metal ((this whack-a-metal) (arg0 int)) (dotimes (v1-0 2) (if (nonzero? (-> this score-part v1-0)) (&+! (-> this score-part v1-0) arg0) ) ) - (the-as - whack-a-metal - ((the-as (function process-drawable int process-drawable) (find-parent-method whack-a-metal 7)) this arg0) - ) + (call-parent-method this arg0) ) (defmethod whack-a-metal-method-29 whack-a-metal ((this whack-a-metal) (arg0 int) (arg1 int)) diff --git a/goal_src/jak2/levels/intro/intro-obs.gc b/goal_src/jak2/levels/intro/intro-obs.gc index ea14672ab7..d0d3e476cc 100644 --- a/goal_src/jak2/levels/intro/intro-obs.gc +++ b/goal_src/jak2/levels/intro/intro-obs.gc @@ -347,17 +347,13 @@ This commonly includes things such as: ) ) -;; WARN: Return type mismatch process vs metalhead-spawner. (defmethod relocate metalhead-spawner ((this metalhead-spawner) (arg0 int)) (dotimes (v1-0 19) (if (nonzero? (-> this path-tbl v1-0)) (&+! (-> this path-tbl v1-0) arg0) ) ) - (the-as - metalhead-spawner - ((the-as (function process int process) (find-parent-method metalhead-spawner 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/mountain/mountain-obs.gc b/goal_src/jak2/levels/mountain/mountain-obs.gc index 0e9369c9fe..afd19a7c01 100644 --- a/goal_src/jak2/levels/mountain/mountain-obs.gc +++ b/goal_src/jak2/levels/mountain/mountain-obs.gc @@ -3191,7 +3191,7 @@ This commonly includes things such as: (task-arrow-spawn gp-0 self) ) ) - (let ((t9-5 (-> (the-as state (find-parent-method trans-plat 34)) enter))) + (let ((t9-5 (-> (the-as state (find-parent-state)) enter))) (if t9-5 ((the-as (function none) t9-5)) ) @@ -3201,7 +3201,7 @@ This commonly includes things such as: (while (-> self child) (deactivate (-> self child 0)) ) - (let ((t9-2 (-> (the-as state (find-parent-method trans-plat 34)) exit))) + (let ((t9-2 (-> (the-as state (find-parent-state)) exit))) (if t9-2 (t9-2) ) @@ -3225,7 +3225,7 @@ This commonly includes things such as: 0 ) ) - (let ((t9-2 (-> (the-as state (find-parent-method trans-plat 34)) trans))) + (let ((t9-2 (-> (the-as state (find-parent-state)) trans))) (if t9-2 (t9-2) ) diff --git a/goal_src/jak2/levels/mountain/rhino.gc b/goal_src/jak2/levels/mountain/rhino.gc index aa9e682728..68e6e1bba6 100644 --- a/goal_src/jak2/levels/mountain/rhino.gc +++ b/goal_src/jak2/levels/mountain/rhino.gc @@ -1621,15 +1621,11 @@ (none) ) -;; WARN: Return type mismatch process-focusable vs rhino. (defmethod relocate rhino ((this rhino) (arg0 int)) (if (nonzero? (-> this path-intro)) (&+! (-> this path-intro) arg0) ) - (the-as - rhino - ((the-as (function process-focusable int process-focusable) (find-parent-method rhino 7)) this arg0) - ) + (call-parent-method this arg0) ) (defmethod init-enemy! rhino ((this rhino)) diff --git a/goal_src/jak2/levels/nest/flying-spider.gc b/goal_src/jak2/levels/nest/flying-spider.gc index dfdcd3dd05..f07d00c6aa 100644 --- a/goal_src/jak2/levels/nest/flying-spider.gc +++ b/goal_src/jak2/levels/nest/flying-spider.gc @@ -18,14 +18,11 @@ ) -;; WARN: Return type mismatch sound-id vs none. +;; WARN: Return type mismatch object vs none. (defmethod play-impact-sound flying-spider-shot ((this flying-spider-shot) (arg0 projectile-options)) (if (zero? arg0) (sound-play "fly-spider-shot") - ((the-as (function projectile projectile-options sound-id) (find-parent-method flying-spider-shot 28)) - this - arg0 - ) + (call-parent-method this arg0) ) (none) ) diff --git a/goal_src/jak2/levels/nest/mammoth.gc b/goal_src/jak2/levels/nest/mammoth.gc index 6c0b62eef2..5268848096 100644 --- a/goal_src/jak2/levels/nest/mammoth.gc +++ b/goal_src/jak2/levels/nest/mammoth.gc @@ -1490,17 +1490,13 @@ #f ) -;; WARN: Return type mismatch process-focusable vs mammoth. (defmethod relocate mammoth ((this mammoth) (arg0 int)) (dotimes (v1-0 4) (if (nonzero? (-> this joint-ik v1-0)) (&+! (-> this joint-ik v1-0) arg0) ) ) - (the-as - mammoth - ((the-as (function process-focusable int process-focusable) (find-parent-method mammoth 7)) this arg0) - ) + (call-parent-method this arg0) ) (defmethod init-enemy-collision! mammoth ((this mammoth)) diff --git a/goal_src/jak2/levels/nest/mantis.gc b/goal_src/jak2/levels/nest/mantis.gc index 82c68ad4bd..802d161940 100644 --- a/goal_src/jak2/levels/nest/mantis.gc +++ b/goal_src/jak2/levels/nest/mantis.gc @@ -404,7 +404,7 @@ (defstate active (mantis) :virtual #t :trans (behavior () - (let ((t9-1 (-> (the-as (state enemy) (find-parent-method mantis 32)) trans))) + (let ((t9-1 (-> (the-as (state enemy) (find-parent-state)) trans))) (if t9-1 (t9-1) ) diff --git a/goal_src/jak2/levels/palace/cable/palcab-obs.gc b/goal_src/jak2/levels/palace/cable/palcab-obs.gc index 7b012731b4..b4c3e60070 100644 --- a/goal_src/jak2/levels/palace/cable/palcab-obs.gc +++ b/goal_src/jak2/levels/palace/cable/palcab-obs.gc @@ -913,7 +913,7 @@ This commonly includes things such as: (defmethod deactivate pal-rot-gun ((this pal-rot-gun)) (sound-stop (-> this sound-id)) (sound-stop (-> this shot-sound-id)) - ((the-as (function process-drawable none) (find-parent-method pal-rot-gun 10)) this) + (call-parent-method this) (none) ) diff --git a/goal_src/jak2/levels/ruins/rapid-gunner.gc b/goal_src/jak2/levels/ruins/rapid-gunner.gc index dda704ab07..ca51c8dc5d 100644 --- a/goal_src/jak2/levels/ruins/rapid-gunner.gc +++ b/goal_src/jak2/levels/ruins/rapid-gunner.gc @@ -1413,15 +1413,11 @@ (none) ) -;; WARN: Return type mismatch process-focusable vs rapid-gunner. (defmethod relocate rapid-gunner ((this rapid-gunner) (arg0 int)) (if (nonzero? (-> this joint)) (&+! (-> this joint) arg0) ) - (the-as - rapid-gunner - ((the-as (function process-focusable int process-focusable) (find-parent-method rapid-gunner 7)) this arg0) - ) + (call-parent-method this arg0) ) (defmethod init-enemy! rapid-gunner ((this rapid-gunner)) diff --git a/goal_src/jak2/levels/ruins/ruins-obs.gc b/goal_src/jak2/levels/ruins/ruins-obs.gc index 3e48a691a6..3627282b3a 100644 --- a/goal_src/jak2/levels/ruins/ruins-obs.gc +++ b/goal_src/jak2/levels/ruins/ruins-obs.gc @@ -23,7 +23,7 @@ ) (defmethod rigid-body-object-method-29 sinking-plat ((this sinking-plat) (arg0 float)) - ((the-as (function rigid-body-platform float none) (find-parent-method sinking-plat 29)) this arg0) + (call-parent-method this arg0) (rigid-body-platform-method-56 this (-> this anchor-point)) 0 (none) diff --git a/goal_src/jak2/levels/sewer/hosehead.gc b/goal_src/jak2/levels/sewer/hosehead.gc index 99d5245a35..e08c764843 100644 --- a/goal_src/jak2/levels/sewer/hosehead.gc +++ b/goal_src/jak2/levels/sewer/hosehead.gc @@ -2191,7 +2191,6 @@ ) ) -;; WARN: Return type mismatch none vs hosehead. (defmethod relocate hosehead ((this hosehead) (arg0 int)) (if (nonzero? (-> this head-joint-mod)) (&+! (-> this head-joint-mod) arg0) @@ -2201,7 +2200,7 @@ (&+! (-> this joint-ik v1-4) arg0) ) ) - (the-as hosehead ((the-as (function process-drawable int none) (find-parent-method hosehead 7)) this arg0)) + (call-parent-method this arg0) ) (defmethod init-enemy! hosehead ((this hosehead)) diff --git a/goal_src/jak2/levels/sewer/sew-gunturret.gc b/goal_src/jak2/levels/sewer/sew-gunturret.gc index 12bd91ff6b..9381a2fef2 100644 --- a/goal_src/jak2/levels/sewer/sew-gunturret.gc +++ b/goal_src/jak2/levels/sewer/sew-gunturret.gc @@ -1172,7 +1172,7 @@ (defmethod fire-turret! pal-gun-turret ((this pal-gun-turret) (arg0 symbol)) "@overrides Calls [[sew-gunturret::140]] but also customizes the turret flash via [[set-palcab-turret-flash!]]" - ((the-as (function sew-gunturret symbol none) (find-parent-method pal-gun-turret 140)) this arg0) + (call-parent-method this arg0) (set-palcab-turret-flash! 1.0) ) diff --git a/goal_src/jak2/levels/sewer/sewer-obs2.gc b/goal_src/jak2/levels/sewer/sewer-obs2.gc index 08b6d678f3..079438d4e4 100644 --- a/goal_src/jak2/levels/sewer/sewer-obs2.gc +++ b/goal_src/jak2/levels/sewer/sewer-obs2.gc @@ -136,7 +136,7 @@ (defmethod deactivate sew-elevator ((this sew-elevator)) (sound-stop (-> this sound-id)) - ((the-as (function elevator none) (find-parent-method sew-elevator 10)) this) + (call-parent-method this) (none) ) @@ -313,15 +313,11 @@ For example for an elevator pre-compute the distance between the first and last ) ) -;; WARN: Return type mismatch process-drawable vs sew-valve. (defmethod relocate sew-valve ((this sew-valve) (arg0 int)) (if (nonzero? (-> this joint)) (&+! (-> this joint) arg0) ) - (the-as - sew-valve - ((the-as (function process-drawable int process-drawable) (find-parent-method sew-valve 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/stadium/racebike.gc b/goal_src/jak2/levels/stadium/racebike.gc index c168e64688..0122e0cea3 100644 --- a/goal_src/jak2/levels/stadium/racebike.gc +++ b/goal_src/jak2/levels/stadium/racebike.gc @@ -767,15 +767,11 @@ ) -;; WARN: Return type mismatch process-drawable vs vehicle-race-bike. (defmethod relocate vehicle-race-bike ((this vehicle-race-bike) (arg0 int)) (if (nonzero? (-> this steering-wheel)) (&+! (-> this steering-wheel) arg0) ) - (the-as - vehicle-race-bike - ((the-as (function process-drawable int process-drawable) (find-parent-method vehicle-race-bike 7)) this arg0) - ) + (call-parent-method this arg0) ) (defmethod update-joint-mods vehicle-race-bike ((this vehicle-race-bike)) diff --git a/goal_src/jak2/levels/stadium/skate/skatea-obs.gc b/goal_src/jak2/levels/stadium/skate/skatea-obs.gc index 3b0973a388..33b4da92a0 100644 --- a/goal_src/jak2/levels/stadium/skate/skatea-obs.gc +++ b/goal_src/jak2/levels/stadium/skate/skatea-obs.gc @@ -342,7 +342,7 @@ ) (send-event (handle->process (-> self voicebox)) 'speak-effect #f) (let ((gp-0 (current-time))) - (until (>= (- (current-time) gp-0) (seconds 1)) + (until (time-elapsed? gp-0 (seconds 1)) (suspend) ) ) @@ -382,7 +382,7 @@ ) (send-event (handle->process (-> self voicebox)) 'speak-effect #f) (let ((gp-0 (current-time))) - (until (>= (- (current-time) gp-0) (seconds 1)) + (until (time-elapsed? gp-0 (seconds 1)) (suspend) ) ) @@ -455,7 +455,7 @@ (suspend) ) (let ((gp-0 (current-time))) - (until (>= (- (current-time) gp-0) (seconds 1)) + (until (time-elapsed? gp-0 (seconds 1)) (suspend) ) ) @@ -520,7 +520,7 @@ ) (send-event (handle->process (-> self voicebox)) 'speak-effect #f) (let ((gp-0 (current-time))) - (until (>= (- (current-time) gp-0) (seconds 1)) + (until (time-elapsed? gp-0 (seconds 1)) (suspend) ) ) @@ -560,7 +560,7 @@ ) (send-event (handle->process (-> self voicebox)) 'speak-effect #f) (let ((gp-0 (current-time))) - (until (>= (- (current-time) gp-0) (seconds 1)) + (until (time-elapsed? gp-0 (seconds 1)) (suspend) ) ) @@ -597,7 +597,7 @@ ) (send-event (handle->process (-> self voicebox)) 'speak-effect #f) (let ((gp-0 (current-time))) - (until (>= (- (current-time) gp-0) (seconds 1)) + (until (time-elapsed? gp-0 (seconds 1)) (suspend) ) ) @@ -1313,7 +1313,7 @@ (defmethod deactivate hoverboard-training-manager ((this hoverboard-training-manager)) (send-event *traffic-manager* 'restore-default-settings) - ((the-as (function process none) (find-parent-method hoverboard-training-manager 10)) this) + (call-parent-method this) (none) ) @@ -1432,7 +1432,7 @@ This commonly includes things such as: ) ) :enter (behavior () - (set! (-> self state-time) (current-time)) + (set-time! (-> self state-time)) ) :code (behavior () (until #f @@ -1560,7 +1560,7 @@ This commonly includes things such as: ) ) :enter (behavior () - (set! (-> self state-time) (current-time)) + (set-time! (-> self state-time)) ) :code (behavior () (until #f diff --git a/goal_src/jak2/levels/stadium/stadium-obs.gc b/goal_src/jak2/levels/stadium/stadium-obs.gc index dd7723c328..b1f36e5877 100644 --- a/goal_src/jak2/levels/stadium/stadium-obs.gc +++ b/goal_src/jak2/levels/stadium/stadium-obs.gc @@ -945,7 +945,7 @@ This commonly includes things such as: (if (< 40960.0 (-> arg0 impulse)) (sound-play "rift-fall") ) - ((the-as (function rigid-body-object rigid-body-impact none) (find-parent-method rift-rider 45)) this arg0) + (call-parent-method this arg0) (none) ) @@ -1012,7 +1012,7 @@ This commonly includes things such as: (defmethod deactivate rift-rider ((this rift-rider)) (sound-stop (-> this sound-id)) - ((the-as (function rigid-body-object none) (find-parent-method rift-rider 10)) this) + (call-parent-method this) (none) ) @@ -1968,7 +1968,7 @@ This commonly includes things such as: (send-event (handle->process (-> this hud)) 'hide-and-die) ) (kill-lightning this) - ((the-as (function process-focusable none) (find-parent-method stad-samos 10)) this) + (call-parent-method this) (none) ) diff --git a/goal_src/jak2/levels/strip/strip-obs.gc b/goal_src/jak2/levels/strip/strip-obs.gc index df3cf48529..9332e93984 100644 --- a/goal_src/jak2/levels/strip/strip-obs.gc +++ b/goal_src/jak2/levels/strip/strip-obs.gc @@ -365,15 +365,11 @@ This commonly includes things such as: ) ) -;; WARN: Return type mismatch strip-hazard vs pitspikes. (defmethod relocate pitspikes ((this pitspikes) (arg0 int)) (if (nonzero? (-> this spinner)) (&+! (-> this spinner) arg0) ) - (the-as - pitspikes - ((the-as (function strip-hazard int strip-hazard) (find-parent-method pitspikes 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/tomb/tomb-beetle.gc b/goal_src/jak2/levels/tomb/tomb-beetle.gc index 6d2703f66e..328c04fc43 100644 --- a/goal_src/jak2/levels/tomb/tomb-beetle.gc +++ b/goal_src/jak2/levels/tomb/tomb-beetle.gc @@ -301,7 +301,7 @@ :enter (behavior () (set! (-> self root trans quad) (-> self entity extra trans quad)) (quaternion-copy! (-> self root quat) (-> self entity quat)) - (let ((t9-2 (-> (the-as (state enemy) (find-parent-method tomb-beetle 27)) enter))) + (let ((t9-2 (-> (the-as (state enemy) (find-parent-state)) enter))) (if t9-2 (t9-2) ) diff --git a/goal_src/jak2/levels/tomb/tomb-obs.gc b/goal_src/jak2/levels/tomb/tomb-obs.gc index 7beac462b6..fff7ac4af9 100644 --- a/goal_src/jak2/levels/tomb/tomb-obs.gc +++ b/goal_src/jak2/levels/tomb/tomb-obs.gc @@ -1575,7 +1575,7 @@ This commonly includes things such as: (defmethod deactivate tomb-plat-return ((this tomb-plat-return)) (sound-stop (-> this sound-id)) - ((the-as (function process-drawable none) (find-parent-method tomb-plat-return 10)) this) + (call-parent-method this) (none) ) @@ -1916,7 +1916,7 @@ This commonly includes things such as: (defmethod deactivate tomb-sphinx ((this tomb-sphinx)) (sound-stop (-> this sound-id)) - ((the-as (function process-drawable none) (find-parent-method tomb-sphinx 10)) this) + (call-parent-method this) (none) ) diff --git a/goal_src/jak2/levels/tomb/tomb-water.gc b/goal_src/jak2/levels/tomb/tomb-water.gc index a25200e7f4..b0d1026f84 100644 --- a/goal_src/jak2/levels/tomb/tomb-water.gc +++ b/goal_src/jak2/levels/tomb/tomb-water.gc @@ -622,7 +622,7 @@ This commonly includes things such as: ) ) :trans (behavior () - (let ((t9-1 (-> (the-as (state basebutton) (find-parent-method tomb-beetle-button 30)) trans))) + (let ((t9-1 (-> (the-as (state basebutton) (find-parent-state)) trans))) (if t9-1 (t9-1) ) diff --git a/goal_src/jak2/levels/tomb/widow-extras.gc b/goal_src/jak2/levels/tomb/widow-extras.gc index 254b45175c..ebdfefd312 100644 --- a/goal_src/jak2/levels/tomb/widow-extras.gc +++ b/goal_src/jak2/levels/tomb/widow-extras.gc @@ -1193,11 +1193,10 @@ This commonly includes things such as: (if (nonzero? (-> this skid-part)) (kill-and-free-particles (-> this warning-spark-part)) ) - ((the-as (function process-drawable none) (find-parent-method widow-bomb 10)) this) + (call-parent-method this) (none) ) -;; WARN: Return type mismatch process-drawable vs widow-bomb. (defmethod relocate widow-bomb ((this widow-bomb) (arg0 int)) (if (nonzero? (-> this explode-part)) (&+! (-> this explode-part) arg0) @@ -1217,10 +1216,7 @@ This commonly includes things such as: (if (nonzero? (-> this spin-jm)) (&+! (-> this spin-jm) arg0) ) - (the-as - widow-bomb - ((the-as (function process-drawable int process-drawable) (find-parent-method widow-bomb 7)) this arg0) - ) + (call-parent-method this arg0) ) (defbehavior widow-bomb-reaction widow ((arg0 control-info) (arg1 collide-query) (arg2 vector) (arg3 vector)) @@ -1568,19 +1564,15 @@ This commonly includes things such as: (if (nonzero? (-> this explode-part)) (kill-and-free-particles (-> this explode-part)) ) - ((the-as (function process-drawable none) (find-parent-method tomb-boss-pillar 10)) this) + (call-parent-method this) (none) ) -;; WARN: Return type mismatch process-drawable vs tomb-boss-pillar. (defmethod relocate tomb-boss-pillar ((this tomb-boss-pillar) (arg0 int)) (if (nonzero? (-> this explode-part)) (&+! (-> this explode-part) arg0) ) - (the-as - tomb-boss-pillar - ((the-as (function process-drawable int process-drawable) (find-parent-method tomb-boss-pillar 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; WARN: Return type mismatch object vs none. diff --git a/goal_src/jak2/levels/under/jellyfish.gc b/goal_src/jak2/levels/under/jellyfish.gc index 0d3b8d8516..86bdc6a929 100644 --- a/goal_src/jak2/levels/under/jellyfish.gc +++ b/goal_src/jak2/levels/under/jellyfish.gc @@ -401,7 +401,7 @@ (defstate stare (jellyfish) :virtual #t :enter (behavior () - (let ((t9-1 (-> (the-as (state enemy) (find-parent-method jellyfish 35)) enter))) + (let ((t9-1 (-> (the-as (state enemy) (find-parent-state)) enter))) (if t9-1 (t9-1) ) @@ -1169,7 +1169,7 @@ (defmethod deactivate jellyfish ((this jellyfish)) (sound-stop (-> this sound-id)) - ((the-as (function process-drawable none) (find-parent-method jellyfish 10)) this) + (call-parent-method this) (none) ) diff --git a/goal_src/jak2/levels/under/under-obs.gc b/goal_src/jak2/levels/under/under-obs.gc index fc1ba1040b..665824e111 100644 --- a/goal_src/jak2/levels/under/under-obs.gc +++ b/goal_src/jak2/levels/under/under-obs.gc @@ -866,7 +866,7 @@ This commonly includes things such as: ) (defmethod rigid-body-object-method-29 under-buoy-plat ((this under-buoy-plat) (arg0 float)) - ((the-as (function rigid-body-object float none) (find-parent-method under-buoy-plat 29)) this arg0) + (call-parent-method this arg0) (rigid-body-platform-method-56 this (-> this orig-trans)) 0 (none) @@ -1563,7 +1563,7 @@ This commonly includes things such as: (defmethod deactivate under-lift ((this under-lift)) (sound-stop (-> this sound-id)) - ((the-as (function process-drawable none) (find-parent-method under-lift 10)) this) + (call-parent-method this) (none) ) diff --git a/goal_src/jak2/levels/under/under-shoot-block.gc b/goal_src/jak2/levels/under/under-shoot-block.gc index 0fb34fedbb..74fd3b4850 100644 --- a/goal_src/jak2/levels/under/under-shoot-block.gc +++ b/goal_src/jak2/levels/under/under-shoot-block.gc @@ -2204,7 +2204,7 @@ ) ) ) - ((the-as (function process-drawable none) (find-parent-method under-shoot-block 10)) this) + (call-parent-method this) (none) ) diff --git a/test/decompiler/reference/jak2/engine/ai/enemy_REF.gc b/test/decompiler/reference/jak2/engine/ai/enemy_REF.gc index 6f288b66dc..631e4a0b0e 100644 --- a/test/decompiler/reference/jak2/engine/ai/enemy_REF.gc +++ b/test/decompiler/reference/jak2/engine/ai/enemy_REF.gc @@ -22,15 +22,11 @@ ) ;; definition for method 7 of type enemy -;; WARN: Return type mismatch process-focusable vs enemy. (defmethod relocate enemy ((this enemy) (arg0 int)) (if (nonzero? (-> this neck)) (&+! (-> this neck) arg0) ) - (the-as - enemy - ((the-as (function process-focusable int process-focusable) (find-parent-method enemy 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 117 of type enemy diff --git a/test/decompiler/reference/jak2/engine/ambient/ambient_REF.gc b/test/decompiler/reference/jak2/engine/ambient/ambient_REF.gc index d2f52b0f9c..a6c6b20320 100644 --- a/test/decompiler/reference/jak2/engine/ambient/ambient_REF.gc +++ b/test/decompiler/reference/jak2/engine/ambient/ambient_REF.gc @@ -272,7 +272,7 @@ ;; definition for method 10 of type talker (defmethod deactivate talker ((this talker)) (send-event (handle->process (-> this voicebox)) 'die) - ((the-as (function process none) (find-parent-method talker 10)) this) + (call-parent-method this) (none) ) diff --git a/test/decompiler/reference/jak2/engine/common_objs/collectables_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/collectables_REF.gc index b3a893d602..e19530fd49 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/collectables_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/collectables_REF.gc @@ -1322,7 +1322,7 @@ (if (not (logtest? (-> self fact options) (actor-option no-reaction))) (send-event (handle->process arg1) 'powerup (-> self fact pickup-type) (-> self fact pickup-amount)) ) - (let ((t9-2 (-> (the-as state (find-parent-method eco 26)) code))) + (let ((t9-2 (-> (the-as state (find-parent-state)) code))) (if t9-2 ((the-as (function none) t9-2)) ) @@ -1888,7 +1888,7 @@ This commonly includes things such as: ;; definition for method 10 of type gem (defmethod deactivate gem ((this gem)) (+! (-> *game-info* live-gem-count) -1) - ((the-as (function gem none) (find-parent-method gem 10)) this) + (call-parent-method this) (none) ) diff --git a/test/decompiler/reference/jak2/engine/common_objs/conveyor_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/conveyor_REF.gc index abea432fe2..1b65a327e5 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/conveyor_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/conveyor_REF.gc @@ -103,13 +103,9 @@ ) ;; definition for method 7 of type conveyor -;; WARN: Return type mismatch process-drawable vs conveyor. (defmethod relocate conveyor ((this conveyor) (new-addr int)) (&+! (-> this sections) new-addr) - (the-as - conveyor - ((the-as (function process-drawable int process-drawable) (find-parent-method conveyor 7)) this new-addr) - ) + (call-parent-method this new-addr) ) ;; definition for method 22 of type conveyor diff --git a/test/decompiler/reference/jak2/engine/common_objs/elevator_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/elevator_REF.gc index ee49840548..59b40d5502 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/elevator_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/elevator_REF.gc @@ -808,12 +808,11 @@ For example for an elevator pre-compute the distance between the first and last ) ;; definition for method 7 of type elevator -;; WARN: Return type mismatch base-plat vs elevator. (defmethod relocate elevator ((this elevator) (arg0 int)) (if (nonzero? (-> this path-seq)) (&+! (-> this path-seq) arg0) ) - (the-as elevator ((the-as (function base-plat int base-plat) (find-parent-method elevator 7)) this arg0)) + (call-parent-method this arg0) ) ;; definition for method 40 of type elevator diff --git a/test/decompiler/reference/jak2/engine/common_objs/rigid-body-plat_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/rigid-body-plat_REF.gc index e2fa850137..ee76b1b9c3 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/rigid-body-plat_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/rigid-body-plat_REF.gc @@ -161,18 +161,11 @@ ) ;; definition for method 7 of type rigid-body-platform -;; WARN: Return type mismatch rigid-body-object vs rigid-body-platform. (defmethod relocate rigid-body-platform ((this rigid-body-platform) (new-addr int)) (if (nonzero? (-> this control-point-array)) (&+! (-> this control-point-array) new-addr) ) - (the-as - rigid-body-platform - ((the-as (function rigid-body-object int rigid-body-object) (find-parent-method rigid-body-platform 7)) - this - new-addr - ) - ) + (call-parent-method this new-addr) ) ;; definition for method 53 of type rigid-body-platform diff --git a/test/decompiler/reference/jak2/engine/common_objs/water-anim_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/water-anim_REF.gc index 0191e33767..ea179a81cd 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/water-anim_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/water-anim_REF.gc @@ -63,7 +63,7 @@ (if (nonzero? (-> this flow)) (&+! (-> this flow) arg0) ) - ((the-as (function water-anim int water-anim) (find-parent-method water-anim 7)) this arg0) + (call-parent-method this arg0) ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak2/engine/common_objs/water-flow_REF.gc b/test/decompiler/reference/jak2/engine/common_objs/water-flow_REF.gc index 01f39d9275..63e97e6ffe 100644 --- a/test/decompiler/reference/jak2/engine/common_objs/water-flow_REF.gc +++ b/test/decompiler/reference/jak2/engine/common_objs/water-flow_REF.gc @@ -111,7 +111,7 @@ (if (nonzero? (-> this path)) (&+! (-> this path) arg0) ) - ((the-as (function flow-control int flow-control) (find-parent-method flow-control 7)) this arg0) + (call-parent-method this arg0) ) ;; definition for method 9 of type flow-control diff --git a/test/decompiler/reference/jak2/engine/debug/editable_REF.gc b/test/decompiler/reference/jak2/engine/debug/editable_REF.gc index 5b54c89393..ae820bda62 100644 --- a/test/decompiler/reference/jak2/engine/debug/editable_REF.gc +++ b/test/decompiler/reference/jak2/engine/debug/editable_REF.gc @@ -776,10 +776,7 @@ ) ) ) - ((the-as (function editable-point editable-command none) (find-parent-method editable-point 28)) - this - (the-as editable-command arg0) - ) + (call-parent-method this arg0) 0 (none) ) @@ -1107,7 +1104,7 @@ ;; WARN: Return type mismatch int vs none. ;; WARN: Function (method 25 editable-light) has a return type of none, but the expression builder found a return statement. (defmethod editable-method-25 editable-light ((this editable-light) (arg0 editable-array)) - ((the-as (function editable-light editable-array none) (find-parent-method editable-light 25)) this arg0) + (call-parent-method this arg0) (when (nonzero? (-> this id)) (let ((s5-1 (clear *temp-string*))) (format s5-1 "delete from light where light_id=~D" (-> this id)) @@ -1278,7 +1275,7 @@ (set! (-> s3-0 owner) (delete! this (-> s3-0 owner))) ) ) - ((the-as (function editable-face editable-array none) (find-parent-method editable-face 25)) this arg0) + (call-parent-method this arg0) (none) ) @@ -1308,13 +1305,7 @@ ;; definition for method 27 of type editable-face ;; WARN: Return type mismatch editable-face vs editable. (defmethod editable-method-27 editable-face ((this editable-face) (arg0 editable-array)) - (let ((gp-1 - (the-as - editable-face - ((the-as (function editable-face editable-array editable) (find-parent-method editable-face 27)) this arg0) - ) - ) - ) + (let ((gp-1 (the-as editable-face (call-parent-method this arg0)))) (dotimes (s4-0 (-> gp-1 length)) (set! (-> gp-1 vertex s4-0) (the-as editable-point (editable-method-27 (-> gp-1 vertex s4-0) arg0))) (set! (-> gp-1 vertex s4-0 owner) (cons gp-1 (-> gp-1 vertex s4-0 owner))) @@ -1738,7 +1729,7 @@ (set! (-> s3-0 owner) (delete! this (-> s3-0 owner))) ) ) - ((the-as (function editable-plane editable-array none) (find-parent-method editable-plane 25)) this arg0) + (call-parent-method this arg0) (none) ) @@ -1752,13 +1743,7 @@ ;; definition for method 27 of type editable-plane ;; WARN: Return type mismatch editable-plane vs editable. (defmethod editable-method-27 editable-plane ((this editable-plane) (arg0 editable-array)) - (let ((gp-1 - (the-as - editable-plane - ((the-as (function editable-plane editable-array editable) (find-parent-method editable-plane 27)) this arg0) - ) - ) - ) + (let ((gp-1 (the-as editable-plane (call-parent-method this arg0)))) (dotimes (s4-0 (-> gp-1 length)) (set! (-> gp-1 vertex s4-0) (the-as editable-point (editable-method-27 (-> gp-1 vertex s4-0) arg0))) (set! (-> gp-1 vertex s4-0 owner) (cons gp-1 (-> gp-1 vertex s4-0 owner))) diff --git a/test/decompiler/reference/jak2/engine/debug/nav/nav-graph-editor_REF.gc b/test/decompiler/reference/jak2/engine/debug/nav/nav-graph-editor_REF.gc index 7cd8b0aa0d..897178cef6 100644 --- a/test/decompiler/reference/jak2/engine/debug/nav/nav-graph-editor_REF.gc +++ b/test/decompiler/reference/jak2/engine/debug/nav/nav-graph-editor_REF.gc @@ -225,12 +225,8 @@ ) ;; definition for method 7 of type nav-graph-editor -;; WARN: Return type mismatch none vs nav-graph-editor. (defmethod relocate nav-graph-editor ((this nav-graph-editor) (arg0 int)) - (the-as - nav-graph-editor - ((the-as (function process int none) (find-parent-method nav-graph-editor 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 60 of type nav-graph-editor diff --git a/test/decompiler/reference/jak2/engine/entity/entity_REF.gc b/test/decompiler/reference/jak2/engine/entity/entity_REF.gc index b9e9f8948f..33d04ef432 100644 --- a/test/decompiler/reference/jak2/engine/entity/entity_REF.gc +++ b/test/decompiler/reference/jak2/engine/entity/entity_REF.gc @@ -573,7 +573,7 @@ ;; definition for method 3 of type entity (defmethod inspect entity ((this entity)) - ((the-as (function entity entity) (find-parent-method entity 3)) this) + (call-parent-method this) (format #t "~Ttrans: ~`vector`P~%" (-> this trans)) (format #t "~Taid: ~D~%" (-> this aid)) this @@ -591,7 +591,7 @@ ;; definition for method 3 of type entity-actor (defmethod inspect entity-actor ((this entity-actor)) - ((the-as (function entity entity) (find-parent-method entity-actor 3)) this) + (call-parent-method this) (format #t "~Tetype: ~A~%" (-> this etype)) (format #t "~Ttask: ~d~%" (-> this task)) (format #t "~Tkill-mask: #x~X : (" (-> this kill-mask)) diff --git a/test/decompiler/reference/jak2/engine/game/task/task-control_REF.gc b/test/decompiler/reference/jak2/engine/game/task/task-control_REF.gc index 1453856a8f..c9a524276b 100644 --- a/test/decompiler/reference/jak2/engine/game/task/task-control_REF.gc +++ b/test/decompiler/reference/jak2/engine/game/task/task-control_REF.gc @@ -1647,7 +1647,6 @@ ) ;; definition for method 10 of type fail-mission -;; WARN: Return type mismatch process vs none. (defmethod deactivate fail-mission ((this fail-mission)) (set-filter-color! 1.0 1.0 1.0) (sound-group-continue (sound-group sfx music dialog sog3 ambient dialog2 sog6 sog7)) @@ -1655,7 +1654,7 @@ (update-rates! (-> *display* entity-clock) 1.0) (update-rates! (-> *display* target-clock) 1.0) (update-rates! (-> *display* camera-clock) 1.0) - ((the-as (function process process) (find-parent-method fail-mission 10)) this) + (call-parent-method this) (none) ) diff --git a/test/decompiler/reference/jak2/engine/spatial-hash/spatial-hash_REF.gc b/test/decompiler/reference/jak2/engine/spatial-hash/spatial-hash_REF.gc index 5bccb75dcb..4e276f2979 100644 --- a/test/decompiler/reference/jak2/engine/spatial-hash/spatial-hash_REF.gc +++ b/test/decompiler/reference/jak2/engine/spatial-hash/spatial-hash_REF.gc @@ -813,7 +813,7 @@ ;; WARN: Return type mismatch int vs none. (defmethod dump-grid-info sphere-hash ((this sphere-hash)) "Prints out info about the grid-hash, also draws via [[grid-hash::draw-grid]] if `debug-draw` is `#t`" - ((find-parent-method sphere-hash 15) this) + (call-parent-method this) (new 'stack-no-clear 'vector) (let ((f30-0 6144.0)) (set! (-> this work temp-box-min quad) (-> (target-pos 0) quad)) diff --git a/test/decompiler/reference/jak2/engine/target/logic-target_REF.gc b/test/decompiler/reference/jak2/engine/target/logic-target_REF.gc index f3659316fb..d0142f5d6a 100644 --- a/test/decompiler/reference/jak2/engine/target/logic-target_REF.gc +++ b/test/decompiler/reference/jak2/engine/target/logic-target_REF.gc @@ -3366,7 +3366,7 @@ ) (set! (-> *setting-control* cam-default mode-name) #f) (set-zero! *camera-smush-control*) - ((the-as (function target none) (find-parent-method target 10)) this) + (call-parent-method this) (none) ) diff --git a/test/decompiler/reference/jak2/engine/ui/minimap_REF.gc b/test/decompiler/reference/jak2/engine/ui/minimap_REF.gc index c2aee3251e..292585d4b1 100644 --- a/test/decompiler/reference/jak2/engine/ui/minimap_REF.gc +++ b/test/decompiler/reference/jak2/engine/ui/minimap_REF.gc @@ -1164,7 +1164,7 @@ ;; definition for method 3 of type engine-minimap (defmethod inspect engine-minimap ((this engine-minimap)) - ((the-as (function engine-minimap engine-minimap) (find-parent-method engine-minimap 3)) this) + (call-parent-method this) (let ((s5-0 0) (s4-0 (the-as connection-pers (-> *minimap* engine alive-list))) ) diff --git a/test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc b/test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc index fd8256230f..d2182e2606 100644 --- a/test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc +++ b/test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc @@ -550,7 +550,7 @@ (enable-level-text-file-loading) (persist-with-delay *setting-control* 'allow-progress (seconds 0.1) 'allow-progress #f 0.0 0) (persist-with-delay *setting-control* 'allow-pause (seconds 0.1) 'allow-pause #f 0.0 0) - ((the-as (function progress none) (find-parent-method progress 10)) this) + (call-parent-method this) (none) ) 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 3a7bbf706e..562e30d681 100644 --- a/test/decompiler/reference/jak2/levels/atoll/atoll-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/atoll/atoll-obs_REF.gc @@ -918,22 +918,18 @@ This commonly includes things such as: ;; definition for method 10 of type slider (defmethod deactivate slider ((this slider)) (sound-stop (the-as sound-id (-> this sound-id))) - ((the-as (function process-drawable none) (find-parent-method slider 10)) this) + (call-parent-method this) (none) ) ;; definition for method 7 of type slider -;; WARN: Return type mismatch process-drawable vs slider. (defmethod relocate slider ((this slider) (arg0 int)) (dotimes (v1-0 4) (if (nonzero? (-> this l-bolts v1-0)) (&+! (-> this l-bolts v1-0) arg0) ) ) - (the-as - slider - ((the-as (function process-drawable int process-drawable) (find-parent-method slider 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 11 of type slider diff --git a/test/decompiler/reference/jak2/levels/atoll/juicer_REF.gc b/test/decompiler/reference/jak2/levels/atoll/juicer_REF.gc index a11e761f68..a3625b5ee6 100644 --- a/test/decompiler/reference/jak2/levels/atoll/juicer_REF.gc +++ b/test/decompiler/reference/jak2/levels/atoll/juicer_REF.gc @@ -1869,7 +1869,6 @@ ) ;; definition for method 7 of type juicer -;; WARN: Return type mismatch process-focusable vs juicer. (defmethod relocate juicer ((this juicer) (arg0 int)) (if (nonzero? (-> this intro-path)) (&+! (-> this intro-path) arg0) @@ -1877,10 +1876,7 @@ (if (nonzero? (-> this joint)) (&+! (-> this joint) arg0) ) - (the-as - juicer - ((the-as (function process-focusable int process-focusable) (find-parent-method juicer 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 115 of type juicer diff --git a/test/decompiler/reference/jak2/levels/castle/boss/castle-baron_REF.gc b/test/decompiler/reference/jak2/levels/castle/boss/castle-baron_REF.gc index 1220ae5287..05770deeec 100644 --- a/test/decompiler/reference/jak2/levels/castle/boss/castle-baron_REF.gc +++ b/test/decompiler/reference/jak2/levels/castle/boss/castle-baron_REF.gc @@ -138,7 +138,7 @@ This commonly includes things such as: ;; definition for method 10 of type cboss-elevator (defmethod deactivate cboss-elevator ((this cboss-elevator)) (sound-stop (-> this sound-id)) - ((the-as (function process-drawable none) (find-parent-method cboss-elevator 10)) this) + (call-parent-method this) (none) ) @@ -1493,7 +1493,7 @@ For example for an elevator pre-compute the distance between the first and last ;; WARN: Return type mismatch int vs none. (defmethod init-proj-settings! krew-boss-shot ((this krew-boss-shot)) "Init relevant settings for the [[projectile]] such as gravity, speed, timeout, etc" - ((the-as (function projectile none) (find-parent-method krew-boss-shot 31)) this) + (call-parent-method this) (set! (-> this move) krew-boss-shot-move) (set! (-> this max-speed) 245760.0) (set! (-> this timeout) (seconds 5)) diff --git a/test/decompiler/reference/jak2/levels/castle/castle-obs_REF.gc b/test/decompiler/reference/jak2/levels/castle/castle-obs_REF.gc index 8e30ce417e..9cce38d435 100644 --- a/test/decompiler/reference/jak2/levels/castle/castle-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/castle/castle-obs_REF.gc @@ -101,7 +101,7 @@ This commonly includes things such as: ;; definition for method 10 of type cas-conveyor (defmethod deactivate cas-conveyor ((this cas-conveyor)) (sound-stop (-> this sound-id)) - ((the-as (function conveyor none) (find-parent-method cas-conveyor 10)) this) + (call-parent-method this) (none) ) @@ -1056,7 +1056,7 @@ This commonly includes things such as: ;; definition for method 10 of type cas-elevator (defmethod deactivate cas-elevator ((this cas-elevator)) (sound-stop (-> this sound-id)) - ((the-as (function elevator none) (find-parent-method cas-elevator 10)) this) + (call-parent-method this) (none) ) @@ -2225,7 +2225,7 @@ This commonly includes things such as: ;; definition for method 10 of type cas-rot-blade (defmethod deactivate cas-rot-blade ((this cas-rot-blade)) (sound-stop (-> this sound-id)) - ((the-as (function process-drawable none) (find-parent-method cas-rot-blade 10)) this) + (call-parent-method this) (none) ) diff --git a/test/decompiler/reference/jak2/levels/castle/pad/caspad-obs_REF.gc b/test/decompiler/reference/jak2/levels/castle/pad/caspad-obs_REF.gc index d535f03db7..c117b5f3b6 100644 --- a/test/decompiler/reference/jak2/levels/castle/pad/caspad-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/castle/pad/caspad-obs_REF.gc @@ -170,7 +170,7 @@ ;; definition for method 10 of type cpad-elevator (defmethod deactivate cpad-elevator ((this cpad-elevator)) (sound-stop (-> this sound-id)) - ((the-as (function elevator none) (find-parent-method cpad-elevator 10)) this) + (call-parent-method this) (none) ) diff --git a/test/decompiler/reference/jak2/levels/castle/roboguard-level_REF.gc b/test/decompiler/reference/jak2/levels/castle/roboguard-level_REF.gc index 9d50333dfd..da554fb997 100644 --- a/test/decompiler/reference/jak2/levels/castle/roboguard-level_REF.gc +++ b/test/decompiler/reference/jak2/levels/castle/roboguard-level_REF.gc @@ -362,9 +362,9 @@ (defstate ambush (roboguard-level) :virtual #t :enter (behavior () - (let ((t9-1 (-> (the-as state (find-parent-method roboguard-level 44)) enter))) + (let ((t9-1 (-> (find-parent-state) enter))) (if t9-1 - ((the-as (function none) t9-1)) + (t9-1) ) ) (logand! (-> self flags) -9) @@ -431,9 +431,9 @@ (defstate idle (roboguard-level) :virtual #t :enter (behavior () - (let ((t9-1 (-> (the-as state (find-parent-method roboguard-level 31)) enter))) + (let ((t9-1 (-> (find-parent-state) enter))) (if t9-1 - ((the-as (function none) t9-1)) + (t9-1) ) ) (roboguard-level-method-185 self (the-as symbol 0)) @@ -520,9 +520,9 @@ (defstate stare (roboguard-level) :virtual #t :enter (behavior () - (let ((t9-1 (-> (the-as state (find-parent-method roboguard-level 35)) enter))) + (let ((t9-1 (-> (find-parent-state) enter))) (if t9-1 - ((the-as (function none) t9-1)) + (t9-1) ) ) (roboguard-level-method-185 self (the-as symbol 0)) @@ -789,9 +789,9 @@ (defstate die (roboguard-level) :virtual #t :enter (behavior () - (let ((t9-1 (-> (the-as state (find-parent-method roboguard-level 38)) enter))) + (let ((t9-1 (-> (find-parent-state) enter))) (if t9-1 - ((the-as (function none) t9-1)) + (t9-1) ) ) (roboguard-level-method-185 self (the-as symbol 0)) @@ -1239,17 +1239,13 @@ ;; definition for method 10 of type roboguard-level (defmethod deactivate roboguard-level ((this roboguard-level)) (sound-stop (-> this roll-sound)) - ((the-as (function nav-enemy none) (find-parent-method roboguard-level 10)) this) + (call-parent-method this) (none) ) ;; definition for method 7 of type roboguard-level -;; WARN: Return type mismatch nav-enemy vs roboguard-level. (defmethod relocate roboguard-level ((this roboguard-level) (arg0 int)) - (the-as - roboguard-level - ((the-as (function nav-enemy int nav-enemy) (find-parent-method roboguard-level 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 114 of type roboguard-level diff --git a/test/decompiler/reference/jak2/levels/city/bombbot/bombbot_REF.gc b/test/decompiler/reference/jak2/levels/city/bombbot/bombbot_REF.gc index d4f2dcae31..758978be7b 100644 --- a/test/decompiler/reference/jak2/levels/city/bombbot/bombbot_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/bombbot/bombbot_REF.gc @@ -2305,7 +2305,6 @@ ) ;; definition for method 7 of type bombbot -;; WARN: Return type mismatch nav-enemy vs bombbot. (defmethod relocate bombbot ((this bombbot) (arg0 int)) (dotimes (v1-0 4) (if (nonzero? (-> this joint-ik v1-0)) @@ -2315,7 +2314,7 @@ (if (nonzero? (-> this rigidbody)) (&+! (-> this rigidbody) arg0) ) - (the-as bombbot ((the-as (function nav-enemy int nav-enemy) (find-parent-method bombbot 7)) this arg0)) + (call-parent-method this arg0) ) ;; definition for method 114 of type bombbot diff --git a/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc b/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc index 8a379f3917..484e2bf65c 100644 --- a/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc @@ -2056,7 +2056,6 @@ This commonly includes things such as: ) ;; definition for method 7 of type cty-guard-turret -;; WARN: Return type mismatch process-focusable vs cty-guard-turret. (defmethod relocate cty-guard-turret ((this cty-guard-turret) (arg0 int)) (if (nonzero? (-> this jm-turret)) (&+! (-> this jm-turret) arg0) @@ -2067,13 +2066,7 @@ This commonly includes things such as: (if (nonzero? (-> this jm-gunsR)) (&+! (-> this jm-gunsR) arg0) ) - (the-as - cty-guard-turret - ((the-as (function process-focusable int process-focusable) (find-parent-method cty-guard-turret 7)) - this - arg0 - ) - ) + (call-parent-method this arg0) ) ;; definition for method 32 of type cty-guard-turret @@ -4100,7 +4093,6 @@ This commonly includes things such as: ) ;; definition for method 7 of type barons-ship-lores -;; WARN: Return type mismatch process-drawable vs barons-ship-lores. (defmethod relocate barons-ship-lores ((this barons-ship-lores) (arg0 int)) (if (nonzero? (-> this paths 0)) (&+! (-> this paths 0) arg0) @@ -4111,10 +4103,7 @@ This commonly includes things such as: (if (nonzero? (-> this paths 2)) (&+! (-> this paths 2) arg0) ) - (the-as - barons-ship-lores - ((the-as (function process-drawable int process-drawable) (find-parent-method barons-ship-lores 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; failed to figure out what this is: diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/guard_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/guard_REF.gc index 0eb5f13e94..18a88f085d 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/guard_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/guard_REF.gc @@ -3870,7 +3870,6 @@ ) ;; definition for method 7 of type crimson-guard -;; WARN: Return type mismatch process-drawable vs crimson-guard. (defmethod relocate crimson-guard ((this crimson-guard) (arg0 int)) (if (nonzero? (-> this joint)) (&+! (-> this joint) arg0) @@ -3878,10 +3877,7 @@ (if (nonzero? (-> this l-control)) (&+! (-> this l-control) arg0) ) - (the-as - crimson-guard - ((the-as (function process-drawable int process-drawable) (find-parent-method crimson-guard 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 115 of type crimson-guard diff --git a/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-predator_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-predator_REF.gc index f629f01cc7..919c48785c 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-predator_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/citizen/metalhead-predator_REF.gc @@ -1159,15 +1159,8 @@ ) ;; definition for method 7 of type metalhead-predator -;; WARN: Return type mismatch process-drawable vs metalhead-predator. (defmethod relocate metalhead-predator ((this metalhead-predator) (arg0 int)) - (the-as - metalhead-predator - ((the-as (function process-drawable int process-drawable) (find-parent-method metalhead-predator 7)) - this - arg0 - ) - ) + (call-parent-method this arg0) ) ;; definition for method 115 of type metalhead-predator diff --git a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/bike_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/bike_REF.gc index b3f33005dd..76639dab17 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/bike_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/bike_REF.gc @@ -942,7 +942,7 @@ ;; definition for method 36 of type bike-base ;; WARN: Return type mismatch int vs none. (defmethod do-engine-sounds bike-base ((this bike-base)) - ((the-as (function object none) (find-parent-method bike-base 36)) this) + (call-parent-method this) (when (logtest? (-> this flags) (rigid-body-object-flag player-driving)) (if (zero? (-> this roll-sound-id)) (set! (-> this roll-sound-id) (new-sound-id)) @@ -977,7 +977,7 @@ ;; INFO: Used lq/sq ;; WARN: Return type mismatch int vs none. (defmethod draw-thrusters bike-base ((this bike-base)) - ((the-as (function object none) (find-parent-method bike-base 85)) this) + (call-parent-method this) (when (logtest? (-> this rbody state flags) (rigid-body-flag enable-physics)) (let ((s5-0 (new 'stack-no-clear 'inline-array 'matrix 3))) (let* ((v1-4 (the-as object (-> s5-0 0 vector 2))) @@ -1093,7 +1093,7 @@ (if (nonzero? (-> this brake-r)) (&+! (-> this brake-r) arg0) ) - ((the-as (function object int bikea) (find-parent-method bikea 7)) this arg0) + (call-parent-method this arg0) ) ;; definition for method 32 of type bikea @@ -1255,7 +1255,7 @@ (if (nonzero? (-> this flap-r)) (&+! (-> this flap-r) arg0) ) - ((the-as (function object int bikeb) (find-parent-method bikeb 7)) this arg0) + (call-parent-method this arg0) ) ;; definition for method 32 of type bikeb @@ -1434,7 +1434,7 @@ (if (nonzero? (-> this spoiler-r)) (&+! (-> this spoiler-r) arg0) ) - ((the-as (function object int bikec) (find-parent-method bikec 7)) this arg0) + (call-parent-method this arg0) ) ;; definition for method 32 of type bikec @@ -1591,7 +1591,7 @@ (if (nonzero? (-> this turret-jm)) (&+! (-> this turret-jm) arg0) ) - ((the-as (function object int guard-bike) (find-parent-method guard-bike 7)) this arg0) + (call-parent-method this arg0) ) ;; definition for method 65 of type guard-bike diff --git a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/car_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/car_REF.gc index af300f88bc..70823a0893 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/car_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/car_REF.gc @@ -1216,7 +1216,7 @@ (if (nonzero? (-> this rudder-r)) (&+! (-> this rudder-r) arg0) ) - ((the-as (function object object cara) (find-parent-method cara 7)) this arg0) + (call-parent-method this arg0) ) ;; definition for method 32 of type cara @@ -1382,7 +1382,7 @@ (if (nonzero? (-> this fin-rr)) (&+! (-> this fin-rr) arg0) ) - ((the-as (function object object carb) (find-parent-method carb 7)) this arg0) + (call-parent-method this arg0) ) ;; definition for method 32 of type carb @@ -1526,7 +1526,6 @@ ) ;; definition for method 7 of type carc -;; WARN: Return type mismatch carb vs carc. (defmethod relocate carc ((this carc) (arg0 int)) (if (nonzero? (-> this steering-wheel)) (&+! (-> this steering-wheel) arg0) @@ -1549,7 +1548,7 @@ (if (nonzero? (-> this fin2-rr)) (&+! (-> this fin2-rr) arg0) ) - (the-as carc ((the-as (function object object carb) (find-parent-method carc 7)) this arg0)) + (call-parent-method this arg0) ) ;; definition for method 32 of type carc @@ -1704,7 +1703,7 @@ (if (nonzero? (-> this turret-jm)) (&+! (-> this turret-jm) arg0) ) - ((the-as (function object object hellcat) (find-parent-method hellcat 7)) this arg0) + (call-parent-method this arg0) ) ;; definition for method 32 of type hellcat diff --git a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/transport_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/transport_REF.gc index f2054df471..4cc96521ff 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/transport_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/transport_REF.gc @@ -133,15 +133,11 @@ ) ;; definition for method 7 of type vehicle-turret -;; WARN: Return type mismatch process-drawable vs vehicle-turret. (defmethod relocate vehicle-turret ((this vehicle-turret) (arg0 int)) (if (nonzero? (-> this turret-jm)) (&+! (-> this turret-jm) arg0) ) - (the-as - vehicle-turret - ((the-as (function process-drawable int process-drawable) (find-parent-method vehicle-turret 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 30 of type vehicle-turret @@ -339,7 +335,7 @@ ;; definition for method 10 of type transport (defmethod deactivate transport ((this transport)) (sound-stop (-> this ambient-sound-id)) - ((the-as (function process-drawable none) (find-parent-method transport 10)) this) + (call-parent-method this) (none) ) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-rider_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-rider_REF.gc index b09bcc68bf..3aa0e5de6a 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-rider_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-rider_REF.gc @@ -344,7 +344,7 @@ This commonly includes things such as: ;; definition for method 33 of type citizen-norm-rider ;; WARN: Return type mismatch int vs none. (defmethod vehicle-rider-method-33 citizen-norm-rider ((this citizen-norm-rider)) - ((the-as (function vehicle-rider none) (find-parent-method citizen-norm-rider 33)) this) + (call-parent-method this) (setup-masks (-> this draw) 0 -1) (setup-masks (-> this draw) 32 0) (cond @@ -461,7 +461,7 @@ This commonly includes things such as: ;; definition for method 33 of type crimson-guard-rider ;; WARN: Return type mismatch int vs none. (defmethod vehicle-rider-method-33 crimson-guard-rider ((this crimson-guard-rider)) - ((the-as (function vehicle-rider none) (find-parent-method crimson-guard-rider 33)) this) + (call-parent-method this) (setup-masks (-> this draw) 0 28) (setup-masks (-> this draw) 3 0) (if (logtest? (-> this flags) 4) diff --git a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-util_REF.gc b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-util_REF.gc index a6d974f149..f2da4eb1ec 100644 --- a/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-util_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/traffic/vehicle/vehicle-util_REF.gc @@ -198,7 +198,7 @@ ;; definition for method 10 of type vehicle (defmethod deactivate vehicle ((this vehicle)) (vehicle-method-110 this) - ((the-as (function rigid-body-object none) (find-parent-method vehicle 10)) this) + (call-parent-method this) (none) ) diff --git a/test/decompiler/reference/jak2/levels/common/ai/ashelin/ash-shot_REF.gc b/test/decompiler/reference/jak2/levels/common/ai/ashelin/ash-shot_REF.gc index 9fe8cc5a73..c1bb364435 100644 --- a/test/decompiler/reference/jak2/levels/common/ai/ashelin/ash-shot_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/ai/ashelin/ash-shot_REF.gc @@ -401,7 +401,7 @@ (sound-play "ashelin-shot-hi") ) ((= v1-0 (projectile-options lose-altitude proj-options-2)) - ((the-as (function projectile projectile-options none) (find-parent-method ashelin-shot 28)) this arg0) + (call-parent-method this arg0) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/common/battle_REF.gc b/test/decompiler/reference/jak2/levels/common/battle_REF.gc index c3ea7908d8..2f06eefc7a 100644 --- a/test/decompiler/reference/jak2/levels/common/battle_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/battle_REF.gc @@ -1745,14 +1745,10 @@ ) ;; definition for method 7 of type battle -;; WARN: Return type mismatch process-drawable vs battle. (defmethod relocate battle ((this battle) (arg0 int)) (&+! (-> this spawners) arg0) (&+! (-> this allies) arg0) - (the-as - battle - ((the-as (function process-drawable int process-drawable) (find-parent-method battle 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 29 of type battle diff --git a/test/decompiler/reference/jak2/levels/common/elec-gate_REF.gc b/test/decompiler/reference/jak2/levels/common/elec-gate_REF.gc index ca3d23c131..9757a8916d 100644 --- a/test/decompiler/reference/jak2/levels/common/elec-gate_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/elec-gate_REF.gc @@ -836,7 +836,7 @@ ;; definition for method 10 of type elec-gate (defmethod deactivate elec-gate ((this elec-gate)) (set-elec-scale-if-close! this 0.0) - ((the-as (function process-drawable none) (find-parent-method elec-gate 10)) this) + (call-parent-method this) (none) ) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/centurion_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/centurion_REF.gc index c23c7c08fa..75b988f6a6 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/centurion_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/centurion_REF.gc @@ -186,7 +186,7 @@ (sound-play "cent-shot-hit") ) ((= v1-0 (projectile-options lose-altitude proj-options-2)) - ((the-as (function projectile projectile-options sound-id) (find-parent-method centurion-shot 28)) this arg0) + (call-parent-method this arg0) ) ) ) @@ -198,7 +198,7 @@ ;; WARN: Return type mismatch int vs none. (defmethod init-proj-settings! centurion-shot ((this centurion-shot)) "Init relevant settings for the [[projectile]] such as gravity, speed, timeout, etc" - ((the-as (function projectile none) (find-parent-method centurion-shot 31)) this) + (call-parent-method this) (set! (-> this max-speed) 327680.0) (set! (-> this timeout) (seconds 1.25)) (none) @@ -983,7 +983,7 @@ (defmethod dispose! centurion ((this centurion)) "Cleans-up the enemy and any associated resources. Potentially spawns skull gems" (play-communicator-speech! (-> *talker-speech* 58)) - ((the-as (function enemy none) (find-parent-method centurion 132)) this) + (call-parent-method this) (none) ) @@ -1596,15 +1596,11 @@ ) ;; definition for method 7 of type centurion -;; WARN: Return type mismatch process-focusable vs centurion. (defmethod relocate centurion ((this centurion) (arg0 int)) (if (nonzero? (-> this joint)) (&+! (-> this joint) arg0) ) - (the-as - centurion - ((the-as (function process-focusable int process-focusable) (find-parent-method centurion 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 115 of type centurion diff --git a/test/decompiler/reference/jak2/levels/common/enemy/flitter_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/flitter_REF.gc index 7a03e2f894..7b39f359ca 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/flitter_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/flitter_REF.gc @@ -1305,7 +1305,7 @@ (logior! (-> this minimap flags) (minimap-flag fade-out)) (set! (-> this minimap) #f) ) - ((the-as (function nav-enemy none) (find-parent-method flitter 132)) this) + (call-parent-method this) (none) ) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/fodder/fodder_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/fodder/fodder_REF.gc index f0992882e2..44de7ee719 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/fodder/fodder_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/fodder/fodder_REF.gc @@ -1100,7 +1100,6 @@ ) ;; definition for method 7 of type fodder -;; WARN: Return type mismatch nav-enemy vs fodder. (defmethod relocate fodder ((this fodder) (arg0 int)) (if (nonzero? (-> this left-eye)) (&+! (-> this left-eye) arg0) @@ -1108,7 +1107,7 @@ (if (nonzero? (-> this right-eye)) (&+! (-> this right-eye) arg0) ) - (the-as fodder ((the-as (function nav-enemy int nav-enemy) (find-parent-method fodder 7)) this arg0)) + (call-parent-method this arg0) ) ;; definition for function fodder-setup-eye-control diff --git a/test/decompiler/reference/jak2/levels/common/enemy/grenadier_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/grenadier_REF.gc index c6764bfa52..842f671bbb 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/grenadier_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/grenadier_REF.gc @@ -1293,7 +1293,6 @@ ) ;; definition for method 7 of type grenadier -;; WARN: Return type mismatch process-focusable vs grenadier. (defmethod relocate grenadier ((this grenadier) (arg0 int)) (if (nonzero? (-> this joint)) (&+! (-> this joint) arg0) @@ -1303,10 +1302,7 @@ (&+! (-> this hostile-path) arg0) ) ) - (the-as - grenadier - ((the-as (function process-focusable int process-focusable) (find-parent-method grenadier 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 115 of type grenadier diff --git a/test/decompiler/reference/jak2/levels/common/enemy/grunt_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/grunt_REF.gc index e9884d097c..2d9c992ef2 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/grunt_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/grunt_REF.gc @@ -1489,7 +1489,7 @@ (logior! (-> this minimap flags) (minimap-flag fade-out)) (set! (-> this minimap) #f) ) - ((the-as (function nav-enemy none) (find-parent-method grunt 132)) this) + (call-parent-method this) (none) ) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/guards/crimson-guard-level_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/guards/crimson-guard-level_REF.gc index 7f3478b29d..3a011e2e53 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/guards/crimson-guard-level_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/guards/crimson-guard-level_REF.gc @@ -4313,7 +4313,6 @@ ) ;; definition for method 7 of type crimson-guard-level -;; WARN: Return type mismatch nav-enemy vs crimson-guard-level. (defmethod relocate crimson-guard-level ((this crimson-guard-level) (arg0 int)) (if (nonzero? (-> this joint)) (&+! (-> this joint) arg0) @@ -4321,10 +4320,7 @@ (if (nonzero? (-> this l-control)) (&+! (-> this l-control) arg0) ) - (the-as - crimson-guard-level - ((the-as (function nav-enemy int nav-enemy) (find-parent-method crimson-guard-level 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 203 of type crimson-guard-level diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hopper_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hopper_REF.gc index 7fc8ef454d..6c7db238f8 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/hopper_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/hopper_REF.gc @@ -864,20 +864,16 @@ (logior! (-> this minimap flags) (minimap-flag fade-out)) (set! (-> this minimap) #f) ) - ((the-as (function enemy none) (find-parent-method hopper 132)) this) + (call-parent-method this) (none) ) ;; definition for method 7 of type hopper -;; WARN: Return type mismatch process-focusable vs hopper. (defmethod relocate hopper ((this hopper) (arg0 int)) (if (nonzero? (-> this path-intro)) (&+! (-> this path-intro) arg0) ) - (the-as - hopper - ((the-as (function process-focusable int process-focusable) (find-parent-method hopper 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 114 of type hopper diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/crimson-guard-hover_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/crimson-guard-hover_REF.gc index 7376f7a35e..a1e61ae475 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/hover/crimson-guard-hover_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/crimson-guard-hover_REF.gc @@ -667,7 +667,7 @@ (defmethod enemy-method-135 crimson-guard-hover ((this crimson-guard-hover) (arg0 int)) (if (and (zero? arg0) (logtest? #x4000000 (-> this incoming penetrate-using))) (sound-play "hover-take-hit") - ((the-as (function enemy int sound-id) (find-parent-method crimson-guard-hover 135)) this arg0) + (call-parent-method this arg0) ) (the-as sound-id 0) ) @@ -995,7 +995,7 @@ (defstate knocked (crimson-guard-hover) :virtual #t :enter (behavior () - (let ((t9-1 (-> (the-as (state hover-enemy) (find-parent-method crimson-guard-hover 30)) enter))) + (let ((t9-1 (-> (find-parent-state) enter))) (if t9-1 (t9-1) ) @@ -1072,7 +1072,7 @@ (defstate flying-death (crimson-guard-hover) :virtual #t :enter (behavior () - (let ((t9-1 (-> (the-as (state hover-enemy) (find-parent-method crimson-guard-hover 138)) enter))) + (let ((t9-1 (-> (find-parent-state) enter))) (if t9-1 (t9-1) ) @@ -1134,7 +1134,7 @@ (defstate flying-death-explode (crimson-guard-hover) :virtual #t :enter (behavior () - (let ((t9-1 (-> (the-as (state hover-enemy) (find-parent-method crimson-guard-hover 139)) enter))) + (let ((t9-1 (-> (find-parent-state) enter))) (if t9-1 (t9-1) ) @@ -1231,16 +1231,7 @@ ) ) ) - ((the-as - (function enemy process int symbol event-message-block object) - (find-parent-method crimson-guard-hover 74) - ) - this - arg0 - arg1 - arg2 - arg3 - ) + (call-parent-method this arg0 arg1 arg2 arg3) ) (('notify) (let ((a0-27 (the-as object (-> arg3 param 0))) @@ -1260,28 +1251,10 @@ ) ) ) - ((the-as - (function enemy process int symbol event-message-block object) - (find-parent-method crimson-guard-hover 74) - ) - this - arg0 - arg1 - arg2 - arg3 - ) + (call-parent-method this arg0 arg1 arg2 arg3) ) (else - ((the-as - (function enemy process int symbol event-message-block object) - (find-parent-method crimson-guard-hover 74) - ) - this - arg0 - arg1 - arg2 - arg3 - ) + (call-parent-method this arg0 arg1 arg2 arg3) ) ) ) @@ -1380,7 +1353,7 @@ ) ) (else - ((the-as (function hover-enemy vector none) (find-parent-method crimson-guard-hover 52)) this arg0) + (call-parent-method this arg0) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/flamer_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/flamer_REF.gc index 63c7ff49d9..9ede4df536 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/hover/flamer_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/flamer_REF.gc @@ -1496,15 +1496,11 @@ ) ;; definition for method 7 of type flamer -;; WARN: Return type mismatch process-drawable vs flamer. (defmethod relocate flamer ((this flamer) (arg0 int)) (if (nonzero? (-> this flit-joint)) (&+! (-> this flit-joint) arg0) ) - (the-as - flamer - ((the-as (function process-drawable int process-drawable) (find-parent-method flamer 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 115 of type flamer diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-enemy-battle_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-enemy-battle_REF.gc index 7afa1b734c..47e8f18bfd 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-enemy-battle_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-enemy-battle_REF.gc @@ -287,7 +287,6 @@ ) ;; definition for method 7 of type hover-enemy-manager -;; WARN: Return type mismatch process vs hover-enemy-manager. (defmethod relocate hover-enemy-manager ((this hover-enemy-manager) (arg0 int)) (when (-> this formation) (if (nonzero? (-> this formation)) @@ -297,10 +296,7 @@ (if (nonzero? (-> this path)) (&+! (-> this path) arg0) ) - (the-as - hover-enemy-manager - ((the-as (function process int process) (find-parent-method hover-enemy-manager 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 17 of type hover-enemy-manager diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-enemy_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-enemy_REF.gc index 78e22e96a9..a4fbbbeec4 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-enemy_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-enemy_REF.gc @@ -629,7 +629,7 @@ (set! (-> self knocked-start-level) (-> self root trans y)) ) :exit (behavior () - (let ((t9-1 (-> (the-as state (find-parent-method hover-enemy 30)) exit))) + (let ((t9-1 (-> (the-as state (find-parent-state)) exit))) (if t9-1 (t9-1) ) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-formation_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-formation_REF.gc index ad4381eba9..b5e4749eac 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-formation_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/hover-formation_REF.gc @@ -681,7 +681,6 @@ ) ;; definition for method 7 of type hover-formation -;; WARN: Return type mismatch basic vs hover-formation. (defmethod relocate hover-formation ((this hover-formation) (arg0 int)) (if (nonzero? (-> this formation)) (&+! (-> this formation) arg0) @@ -689,10 +688,7 @@ (if (nonzero? (-> this path)) (&+! (-> this path) arg0) ) - (the-as - hover-formation - ((the-as (function basic int basic) (find-parent-method hover-formation 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 15 of type hover-formation diff --git a/test/decompiler/reference/jak2/levels/common/enemy/hover/wasp_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/hover/wasp_REF.gc index 10cc412ae9..fc71d3c3a9 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/hover/wasp_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/hover/wasp_REF.gc @@ -537,7 +537,7 @@ ) ) (else - ((the-as (function enemy vector none) (find-parent-method wasp 52)) this arg0) + (call-parent-method this arg0) ) ) ) diff --git a/test/decompiler/reference/jak2/levels/common/enemy/metalmonk_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/metalmonk_REF.gc index 6cc53de261..871886d00f 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/metalmonk_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/metalmonk_REF.gc @@ -1233,15 +1233,11 @@ ) ;; definition for method 7 of type metalmonk -;; WARN: Return type mismatch process-focusable vs metalmonk. (defmethod relocate metalmonk ((this metalmonk) (arg0 int)) (if (nonzero? (-> this intro-path)) (&+! (-> this intro-path) arg0) ) - (the-as - metalmonk - ((the-as (function process-focusable int process-focusable) (find-parent-method metalmonk 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 115 of type metalmonk diff --git a/test/decompiler/reference/jak2/levels/common/enemy/spyder_REF.gc b/test/decompiler/reference/jak2/levels/common/enemy/spyder_REF.gc index 95e4e0a90f..71f3dadfcb 100644 --- a/test/decompiler/reference/jak2/levels/common/enemy/spyder_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/enemy/spyder_REF.gc @@ -44,7 +44,7 @@ ;; WARN: Return type mismatch int vs none. (defmethod init-proj-settings! spyder-shot ((this spyder-shot)) "Init relevant settings for the [[projectile]] such as gravity, speed, timeout, etc" - ((the-as (function projectile none) (find-parent-method spyder-shot 31)) this) + (call-parent-method this) (set! (-> this max-speed) 307200.0) (set! (-> this timeout) (seconds 0.267)) (none) @@ -1392,7 +1392,6 @@ ) ;; definition for method 7 of type spyder -;; WARN: Return type mismatch process-focusable vs spyder. (defmethod relocate spyder ((this spyder) (arg0 int)) (if (nonzero? (-> this joint)) (&+! (-> this joint) arg0) @@ -1402,10 +1401,7 @@ (&+! (-> this joint-ik v1-4) arg0) ) ) - (the-as - spyder - ((the-as (function process-focusable int process-focusable) (find-parent-method spyder 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 115 of type spyder diff --git a/test/decompiler/reference/jak2/levels/common/entities/com-elevator_REF.gc b/test/decompiler/reference/jak2/levels/common/entities/com-elevator_REF.gc index e26aaf0f0a..2b2c7d912d 100644 --- a/test/decompiler/reference/jak2/levels/common/entities/com-elevator_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/entities/com-elevator_REF.gc @@ -114,9 +114,9 @@ (defstate dormant (com-elevator) :virtual #t :enter (behavior () - (let ((t9-1 (-> (the-as state (find-parent-method com-elevator 34)) enter))) + (let ((t9-1 (-> (find-parent-state) enter))) (if t9-1 - ((the-as (function none) t9-1)) + (t9-1) ) ) (process-entity-status! self (entity-perm-status subtask-complete) #t) @@ -199,7 +199,7 @@ ;; definition for method 10 of type com-elevator (defmethod deactivate com-elevator ((this com-elevator)) (sound-stop (-> this sound-id)) - ((the-as (function elevator none) (find-parent-method com-elevator 10)) this) + (call-parent-method this) (none) ) @@ -350,7 +350,7 @@ For example for an elevator pre-compute the distance between the first and last ;; definition for method 10 of type tomb-trans-elevator (defmethod deactivate tomb-trans-elevator ((this tomb-trans-elevator)) (sound-stop (-> this sound-id)) - ((the-as (function com-elevator none) (find-parent-method tomb-trans-elevator 10)) this) + (call-parent-method this) (none) ) @@ -359,7 +359,7 @@ For example for an elevator pre-compute the distance between the first and last (defmethod init-plat! tomb-trans-elevator ((this tomb-trans-elevator)) "Does any necessary initial platform setup. For example for an elevator pre-compute the distance between the first and last points (both ways) and clear the sound." - ((the-as (function com-elevator none) (find-parent-method tomb-trans-elevator 33)) this) + (call-parent-method this) (set! (-> this sound-id) (new-sound-id)) (none) ) diff --git a/test/decompiler/reference/jak2/levels/common/entities/spydroid_REF.gc b/test/decompiler/reference/jak2/levels/common/entities/spydroid_REF.gc index 4e8895b993..a8f6442507 100644 --- a/test/decompiler/reference/jak2/levels/common/entities/spydroid_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/entities/spydroid_REF.gc @@ -1366,7 +1366,7 @@ (if (nonzero? (-> this explode-part)) (kill-and-free-particles (-> this explode-part)) ) - ((the-as (function process-focusable none) (find-parent-method spydroid 10)) this) + (call-parent-method this) (none) ) 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 6ff54d231e..cb4fba747c 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 @@ -1605,7 +1605,7 @@ (defmethod deactivate race-manager ((this race-manager)) (persist-with-delay *setting-control* 'music-volume (seconds 3) 'music-volume 'abs 0.0 0) (send-event *traffic-manager* 'restore-default-settings) - ((the-as (function process none) (find-parent-method race-manager 10)) this) + (call-parent-method this) (none) ) 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 8bdb52ad43..1a5c181dd3 100644 --- a/test/decompiler/reference/jak2/levels/common/scene-actor_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/scene-actor_REF.gc @@ -861,7 +861,7 @@ This commonly includes things such as: ) ) ) - ((the-as (function process-taskable none) (find-parent-method youngsamos-npc 32)) this) + (call-parent-method this) (none) ) diff --git a/test/decompiler/reference/jak2/levels/dig/dig-obs_REF.gc b/test/decompiler/reference/jak2/levels/dig/dig-obs_REF.gc index ad2eb4828c..09de1ca28e 100644 --- a/test/decompiler/reference/jak2/levels/dig/dig-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/dig/dig-obs_REF.gc @@ -48,7 +48,7 @@ ;; definition for method 29 of type dig-sinking-plat ;; WARN: Return type mismatch int vs none. (defmethod rigid-body-object-method-29 dig-sinking-plat ((this dig-sinking-plat) (arg0 float)) - ((the-as (function rigid-body-platform float none) (find-parent-method dig-sinking-plat 29)) this arg0) + (call-parent-method this arg0) (rigid-body-platform-method-56 this (-> this anchor-point)) 0 (none) diff --git a/test/decompiler/reference/jak2/levels/dig/dig3-obs_REF.gc b/test/decompiler/reference/jak2/levels/dig/dig3-obs_REF.gc index e6b86f2daf..039a21ce0a 100644 --- a/test/decompiler/reference/jak2/levels/dig/dig3-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/dig/dig3-obs_REF.gc @@ -1574,7 +1574,7 @@ This commonly includes things such as: ;; definition for method 29 of type dig-tipping-rock ;; WARN: Return type mismatch int vs none. (defmethod rigid-body-object-method-29 dig-tipping-rock ((this dig-tipping-rock) (arg0 float)) - ((the-as (function rigid-body-platform float none) (find-parent-method dig-tipping-rock 29)) this arg0) + (call-parent-method this arg0) (rigid-body-platform-method-56 this (-> this anchor-point)) 0 (none) diff --git a/test/decompiler/reference/jak2/levels/drill/drill-baron_REF.gc b/test/decompiler/reference/jak2/levels/drill/drill-baron_REF.gc index f09de6ee8c..9a76d69412 100644 --- a/test/decompiler/reference/jak2/levels/drill/drill-baron_REF.gc +++ b/test/decompiler/reference/jak2/levels/drill/drill-baron_REF.gc @@ -1105,7 +1105,6 @@ ) ;; definition for method 7 of type drill-barons-ship-turret -;; WARN: Return type mismatch process-drawable vs drill-barons-ship-turret. (defmethod relocate drill-barons-ship-turret ((this drill-barons-ship-turret) (arg0 int)) (when (-> this jmod) (if (nonzero? (-> this jmod)) @@ -1122,13 +1121,7 @@ (&+! (-> this jmod-right) arg0) ) ) - (the-as - drill-barons-ship-turret - ((the-as (function process-drawable int process-drawable) (find-parent-method drill-barons-ship-turret 7)) - this - arg0 - ) - ) + (call-parent-method this arg0) ) ;; definition for method 11 of type drill-barons-ship @@ -1271,7 +1264,7 @@ This commonly includes things such as: ;; WARN: Return type mismatch int vs none. (defmethod init-proj-settings! drill-ship-shot ((this drill-ship-shot)) "Init relevant settings for the [[projectile]] such as gravity, speed, timeout, etc" - ((the-as (function guard-shot none) (find-parent-method drill-ship-shot 31)) this) + (call-parent-method this) (set! (-> this attack-mode) 'drill-ship-shot) (set! (-> this move) guard-shot-move) (set! (-> this max-speed) 737280.0) diff --git a/test/decompiler/reference/jak2/levels/drill/drill-obs_REF.gc b/test/decompiler/reference/jak2/levels/drill/drill-obs_REF.gc index 3fb114f77e..b3ee53e2b3 100644 --- a/test/decompiler/reference/jak2/levels/drill/drill-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/drill/drill-obs_REF.gc @@ -531,7 +531,7 @@ This commonly includes things such as: ;; definition for method 10 of type drill-elevator (defmethod deactivate drill-elevator ((this drill-elevator)) (sound-stop (-> this sound-id)) - ((the-as (function process-drawable none) (find-parent-method drill-elevator 10)) this) + (call-parent-method this) (none) ) @@ -944,15 +944,11 @@ For example for an elevator pre-compute the distance between the first and last ) ;; definition for method 7 of type fire-floor -;; WARN: Return type mismatch process-drawable vs fire-floor. (defmethod relocate fire-floor ((this fire-floor) (arg0 int)) (if (nonzero? (-> this part-off)) (&+! (-> this part-off) arg0) ) - (the-as - fire-floor - ((the-as (function process-drawable int process-drawable) (find-parent-method fire-floor 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 10 of type fire-floor @@ -961,7 +957,7 @@ For example for an elevator pre-compute the distance between the first and last (if (nonzero? (-> this part-off)) (kill-and-free-particles (-> this part-off)) ) - ((the-as (function process-drawable none) (find-parent-method fire-floor 10)) this) + (call-parent-method this) (none) ) diff --git a/test/decompiler/reference/jak2/levels/drill/drillmid-obs_REF.gc b/test/decompiler/reference/jak2/levels/drill/drillmid-obs_REF.gc index 9fe455e0f1..f29d16398c 100644 --- a/test/decompiler/reference/jak2/levels/drill/drillmid-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/drill/drillmid-obs_REF.gc @@ -204,7 +204,7 @@ This commonly includes things such as: :exit (behavior () (sound-stop (-> self sound-id)) (sound-play "drl-elev-stop") - (let ((t9-4 (-> (the-as state (find-parent-method drill-lift 36)) exit))) + (let ((t9-4 (-> (find-parent-state) exit))) (if t9-4 (t9-4) ) @@ -212,7 +212,7 @@ This commonly includes things such as: ) :post (behavior () (sound-play "drl-elevator-lp" :id (-> self sound-id) :position (-> self root trans)) - (let ((t9-2 (-> (the-as state (find-parent-method drill-lift 36)) post))) + (let ((t9-2 (-> (the-as state (find-parent-state)) post))) (if t9-2 ((the-as (function none) t9-2)) ) diff --git a/test/decompiler/reference/jak2/levels/drill/ginsu_REF.gc b/test/decompiler/reference/jak2/levels/drill/ginsu_REF.gc index c29c40268b..5f3c9b64b6 100644 --- a/test/decompiler/reference/jak2/levels/drill/ginsu_REF.gc +++ b/test/decompiler/reference/jak2/levels/drill/ginsu_REF.gc @@ -992,11 +992,9 @@ ;; definition for method 10 of type ginsu (defmethod deactivate ginsu ((this ginsu)) - (when (nonzero? (-> this blade-part)) - (let ((a0-1 (-> this blade-part))) - ((the-as (function sparticle-launch-control none) (method-of-object a0-1 kill-and-free-particles)) a0-1) + (if (nonzero? (-> this blade-part)) + (kill-and-free-particles (-> this blade-part)) ) - ) (if (-> this blade-sound-playing) (sound-stop (-> this blade-sound)) ) diff --git a/test/decompiler/reference/jak2/levels/forest/forest-obs_REF.gc b/test/decompiler/reference/jak2/levels/forest/forest-obs_REF.gc index 6363c5500b..74d4f1618c 100644 --- a/test/decompiler/reference/jak2/levels/forest/forest-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/forest/forest-obs_REF.gc @@ -438,7 +438,7 @@ This commonly includes things such as: (send-event (handle->process (-> this hud)) 'hide-and-die) ) (sound-stop (-> this sound-id)) - ((the-as (function process-focusable none) (find-parent-method forest-youngsamos 10)) this) + (call-parent-method this) (none) ) diff --git a/test/decompiler/reference/jak2/levels/forest/predator_REF.gc b/test/decompiler/reference/jak2/levels/forest/predator_REF.gc index 93df0012f4..869b481ce2 100644 --- a/test/decompiler/reference/jak2/levels/forest/predator_REF.gc +++ b/test/decompiler/reference/jak2/levels/forest/predator_REF.gc @@ -1506,12 +1506,8 @@ ) ;; definition for method 7 of type predator -;; WARN: Return type mismatch process-focusable vs predator. (defmethod relocate predator ((this predator) (arg0 int)) - (the-as - predator - ((the-as (function process-focusable int process-focusable) (find-parent-method predator 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 167 of type predator diff --git a/test/decompiler/reference/jak2/levels/forest/wren_REF.gc b/test/decompiler/reference/jak2/levels/forest/wren_REF.gc index 15e1c0be34..2a9e55164f 100644 --- a/test/decompiler/reference/jak2/levels/forest/wren_REF.gc +++ b/test/decompiler/reference/jak2/levels/forest/wren_REF.gc @@ -448,7 +448,6 @@ If so, it transitions from [[wren::peck]] to [[wren::hunt]]" ) ;; definition for method 7 of type wren -;; WARN: Return type mismatch process-drawable vs wren. (defmethod relocate wren ((this wren) (arg0 int)) (dotimes (v1-0 2) (when (-> this fly-curve v1-0) @@ -457,10 +456,7 @@ If so, it transitions from [[wren::peck]] to [[wren::hunt]]" ) ) ) - (the-as - wren - ((the-as (function process-drawable int process-drawable) (find-parent-method wren 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 11 of type wren diff --git a/test/decompiler/reference/jak2/levels/fortress/dump/fordumpc-obs_REF.gc b/test/decompiler/reference/jak2/levels/fortress/dump/fordumpc-obs_REF.gc index adfbe21519..20eea3a206 100644 --- a/test/decompiler/reference/jak2/levels/fortress/dump/fordumpc-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/dump/fordumpc-obs_REF.gc @@ -418,7 +418,7 @@ This commonly includes things such as: ;; definition for method 10 of type fort-missile-target (defmethod deactivate fort-missile-target ((this fort-missile-target)) (sound-stop (the-as sound-id (-> this sound-id))) - ((the-as (function process-drawable none) (find-parent-method fort-missile-target 10)) this) + (call-parent-method this) (none) ) @@ -991,15 +991,11 @@ This commonly includes things such as: ) ;; definition for method 7 of type fort-missile -;; WARN: Return type mismatch process-drawable vs fort-missile. (defmethod relocate fort-missile ((this fort-missile) (arg0 int)) (if (nonzero? (-> this part-doom)) (&+! (-> this part-doom) arg0) ) - (the-as - fort-missile - ((the-as (function process-drawable int process-drawable) (find-parent-method fort-missile 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 11 of type fort-missile diff --git a/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank-turret_REF.gc b/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank-turret_REF.gc index d14e62ac2e..804de9106b 100644 --- a/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank-turret_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank-turret_REF.gc @@ -380,7 +380,7 @@ (defmethod deactivate fort-roboscreen ((this fort-roboscreen)) (disable *screen-filter*) (set-roboscreen-alpha! 0.0) - ((the-as (function process-drawable none) (find-parent-method fort-roboscreen 10)) this) + (call-parent-method this) (none) ) diff --git a/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank_REF.gc b/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank_REF.gc index 51f2c99644..86db587b46 100644 --- a/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/dump/fort-robotank_REF.gc @@ -1064,7 +1064,6 @@ ) ;; definition for method 7 of type fort-robotank -;; WARN: Return type mismatch process-drawable vs fort-robotank. (defmethod relocate fort-robotank ((this fort-robotank) (arg0 int)) (if (nonzero? (-> this barrel-part)) (&+! (-> this barrel-part) arg0) @@ -1113,10 +1112,7 @@ ) ) ) - (the-as - fort-robotank - ((the-as (function process-drawable int process-drawable) (find-parent-method fort-robotank 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 11 of type fort-robotank diff --git a/test/decompiler/reference/jak2/levels/fortress/rescue/forresca-obs_REF.gc b/test/decompiler/reference/jak2/levels/fortress/rescue/forresca-obs_REF.gc index f483855397..75426b5a10 100644 --- a/test/decompiler/reference/jak2/levels/fortress/rescue/forresca-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/rescue/forresca-obs_REF.gc @@ -313,7 +313,7 @@ This commonly includes things such as: (defstate shutdown (elec-lock-gate) :virtual #t :enter (behavior () - (let ((t9-1 (-> (the-as state (find-parent-method elec-lock-gate 22)) enter))) + (let ((t9-1 (-> (the-as state (find-parent-state)) enter))) (if t9-1 ((the-as (function none) t9-1)) ) diff --git a/test/decompiler/reference/jak2/levels/fortress/rescue/forrescb-obs_REF.gc b/test/decompiler/reference/jak2/levels/fortress/rescue/forrescb-obs_REF.gc index d824e2a87f..bb1a10545f 100644 --- a/test/decompiler/reference/jak2/levels/fortress/rescue/forrescb-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/fortress/rescue/forrescb-obs_REF.gc @@ -429,7 +429,7 @@ This commonly includes things such as: ;; definition for method 10 of type fort-elec-belt-inst (defmethod deactivate fort-elec-belt-inst ((this fort-elec-belt-inst)) (sound-stop (-> this sound-id)) - ((the-as (function process-drawable none) (find-parent-method fort-elec-belt-inst 10)) this) + (call-parent-method this) (none) ) 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 70a96a30b9..75b9bc5308 100644 --- a/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc @@ -209,7 +209,7 @@ ) (training-manager-method-24 this) (training-manager-method-25 this) - ((the-as (function process none) (find-parent-method training-manager 10)) this) + (call-parent-method this) (none) ) diff --git a/test/decompiler/reference/jak2/levels/hiphog/whack_REF.gc b/test/decompiler/reference/jak2/levels/hiphog/whack_REF.gc index 32a630858a..e48ef02c4d 100644 --- a/test/decompiler/reference/jak2/levels/hiphog/whack_REF.gc +++ b/test/decompiler/reference/jak2/levels/hiphog/whack_REF.gc @@ -1796,22 +1796,18 @@ (kill-and-free-particles (-> this score-part s5-0)) ) ) - ((the-as (function process none) (find-parent-method whack-a-metal 10)) this) + (call-parent-method this) (none) ) ;; definition for method 7 of type whack-a-metal -;; WARN: Return type mismatch process-drawable vs whack-a-metal. (defmethod relocate whack-a-metal ((this whack-a-metal) (arg0 int)) (dotimes (v1-0 2) (if (nonzero? (-> this score-part v1-0)) (&+! (-> this score-part v1-0) arg0) ) ) - (the-as - whack-a-metal - ((the-as (function process-drawable int process-drawable) (find-parent-method whack-a-metal 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 29 of type whack-a-metal diff --git a/test/decompiler/reference/jak2/levels/intro/intro-obs_REF.gc b/test/decompiler/reference/jak2/levels/intro/intro-obs_REF.gc index 3733bee46b..aac87b824f 100644 --- a/test/decompiler/reference/jak2/levels/intro/intro-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/intro/intro-obs_REF.gc @@ -390,17 +390,13 @@ This commonly includes things such as: ) ;; definition for method 7 of type metalhead-spawner -;; WARN: Return type mismatch process vs metalhead-spawner. (defmethod relocate metalhead-spawner ((this metalhead-spawner) (arg0 int)) (dotimes (v1-0 19) (if (nonzero? (-> this path-tbl v1-0)) (&+! (-> this path-tbl v1-0) arg0) ) ) - (the-as - metalhead-spawner - ((the-as (function process int process) (find-parent-method metalhead-spawner 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 11 of type metalhead-spawner 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 c0b00899b1..f39220e67b 100644 --- a/test/decompiler/reference/jak2/levels/mountain/mountain-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/mountain/mountain-obs_REF.gc @@ -3524,7 +3524,7 @@ This commonly includes things such as: (task-arrow-spawn gp-0 self) ) ) - (let ((t9-5 (-> (the-as state (find-parent-method trans-plat 34)) enter))) + (let ((t9-5 (-> (the-as state (find-parent-state)) enter))) (if t9-5 ((the-as (function none) t9-5)) ) @@ -3534,7 +3534,7 @@ This commonly includes things such as: (while (-> self child) (deactivate (-> self child 0)) ) - (let ((t9-2 (-> (the-as state (find-parent-method trans-plat 34)) exit))) + (let ((t9-2 (-> (the-as state (find-parent-state)) exit))) (if t9-2 (t9-2) ) @@ -3558,7 +3558,7 @@ This commonly includes things such as: 0 ) ) - (let ((t9-2 (-> (the-as state (find-parent-method trans-plat 34)) trans))) + (let ((t9-2 (-> (the-as state (find-parent-state)) trans))) (if t9-2 (t9-2) ) diff --git a/test/decompiler/reference/jak2/levels/mountain/rhino_REF.gc b/test/decompiler/reference/jak2/levels/mountain/rhino_REF.gc index f80efa6bbf..171c7ffc3a 100644 --- a/test/decompiler/reference/jak2/levels/mountain/rhino_REF.gc +++ b/test/decompiler/reference/jak2/levels/mountain/rhino_REF.gc @@ -1904,15 +1904,11 @@ ) ;; definition for method 7 of type rhino -;; WARN: Return type mismatch process-focusable vs rhino. (defmethod relocate rhino ((this rhino) (arg0 int)) (if (nonzero? (-> this path-intro)) (&+! (-> this path-intro) arg0) ) - (the-as - rhino - ((the-as (function process-focusable int process-focusable) (find-parent-method rhino 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 115 of type rhino diff --git a/test/decompiler/reference/jak2/levels/nest/flying-spider_REF.gc b/test/decompiler/reference/jak2/levels/nest/flying-spider_REF.gc index a0b99261f3..5c04cc533f 100644 --- a/test/decompiler/reference/jak2/levels/nest/flying-spider_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/flying-spider_REF.gc @@ -24,14 +24,11 @@ ) ;; definition for method 28 of type flying-spider-shot -;; WARN: Return type mismatch sound-id vs none. +;; WARN: Return type mismatch object vs none. (defmethod play-impact-sound flying-spider-shot ((this flying-spider-shot) (arg0 projectile-options)) (if (zero? arg0) (sound-play "fly-spider-shot") - ((the-as (function projectile projectile-options sound-id) (find-parent-method flying-spider-shot 28)) - this - arg0 - ) + (call-parent-method this arg0) ) (none) ) diff --git a/test/decompiler/reference/jak2/levels/nest/mammoth_REF.gc b/test/decompiler/reference/jak2/levels/nest/mammoth_REF.gc index 144f97d924..2d66ed83f3 100644 --- a/test/decompiler/reference/jak2/levels/nest/mammoth_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/mammoth_REF.gc @@ -1588,17 +1588,13 @@ ) ;; definition for method 7 of type mammoth -;; WARN: Return type mismatch process-focusable vs mammoth. (defmethod relocate mammoth ((this mammoth) (arg0 int)) (dotimes (v1-0 4) (if (nonzero? (-> this joint-ik v1-0)) (&+! (-> this joint-ik v1-0) arg0) ) ) - (the-as - mammoth - ((the-as (function process-focusable int process-focusable) (find-parent-method mammoth 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 114 of type mammoth diff --git a/test/decompiler/reference/jak2/levels/nest/mantis_REF.gc b/test/decompiler/reference/jak2/levels/nest/mantis_REF.gc index 16e5c0a28b..72f8124a11 100644 --- a/test/decompiler/reference/jak2/levels/nest/mantis_REF.gc +++ b/test/decompiler/reference/jak2/levels/nest/mantis_REF.gc @@ -448,7 +448,7 @@ (defstate active (mantis) :virtual #t :trans (behavior () - (let ((t9-1 (-> (the-as (state enemy) (find-parent-method mantis 32)) trans))) + (let ((t9-1 (-> (the-as (state enemy) (find-parent-state)) trans))) (if t9-1 (t9-1) ) diff --git a/test/decompiler/reference/jak2/levels/palace/cable/palcab-obs_REF.gc b/test/decompiler/reference/jak2/levels/palace/cable/palcab-obs_REF.gc index 0e5733b042..29de5be14c 100644 --- a/test/decompiler/reference/jak2/levels/palace/cable/palcab-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/palace/cable/palcab-obs_REF.gc @@ -1037,7 +1037,7 @@ This commonly includes things such as: (defmethod deactivate pal-rot-gun ((this pal-rot-gun)) (sound-stop (-> this sound-id)) (sound-stop (-> this shot-sound-id)) - ((the-as (function process-drawable none) (find-parent-method pal-rot-gun 10)) this) + (call-parent-method this) (none) ) diff --git a/test/decompiler/reference/jak2/levels/ruins/rapid-gunner_REF.gc b/test/decompiler/reference/jak2/levels/ruins/rapid-gunner_REF.gc index 40b4d333f3..dffa66dd1f 100644 --- a/test/decompiler/reference/jak2/levels/ruins/rapid-gunner_REF.gc +++ b/test/decompiler/reference/jak2/levels/ruins/rapid-gunner_REF.gc @@ -1466,15 +1466,11 @@ ) ;; definition for method 7 of type rapid-gunner -;; WARN: Return type mismatch process-focusable vs rapid-gunner. (defmethod relocate rapid-gunner ((this rapid-gunner) (arg0 int)) (if (nonzero? (-> this joint)) (&+! (-> this joint) arg0) ) - (the-as - rapid-gunner - ((the-as (function process-focusable int process-focusable) (find-parent-method rapid-gunner 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 115 of type rapid-gunner 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 987d021aa4..0049f8cabf 100644 --- a/test/decompiler/reference/jak2/levels/ruins/ruins-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/ruins/ruins-obs_REF.gc @@ -34,7 +34,7 @@ ;; definition for method 29 of type sinking-plat ;; WARN: Return type mismatch int vs none. (defmethod rigid-body-object-method-29 sinking-plat ((this sinking-plat) (arg0 float)) - ((the-as (function rigid-body-platform float none) (find-parent-method sinking-plat 29)) this arg0) + (call-parent-method this arg0) (rigid-body-platform-method-56 this (-> this anchor-point)) 0 (none) diff --git a/test/decompiler/reference/jak2/levels/sewer/hosehead_REF.gc b/test/decompiler/reference/jak2/levels/sewer/hosehead_REF.gc index 5757f422b6..a45cf0bbc9 100644 --- a/test/decompiler/reference/jak2/levels/sewer/hosehead_REF.gc +++ b/test/decompiler/reference/jak2/levels/sewer/hosehead_REF.gc @@ -2332,7 +2332,6 @@ ) ;; definition for method 7 of type hosehead -;; WARN: Return type mismatch none vs hosehead. (defmethod relocate hosehead ((this hosehead) (arg0 int)) (if (nonzero? (-> this head-joint-mod)) (&+! (-> this head-joint-mod) arg0) @@ -2342,7 +2341,7 @@ (&+! (-> this joint-ik v1-4) arg0) ) ) - (the-as hosehead ((the-as (function process-drawable int none) (find-parent-method hosehead 7)) this arg0)) + (call-parent-method this arg0) ) ;; definition for method 115 of type hosehead diff --git a/test/decompiler/reference/jak2/levels/sewer/sew-gunturret_REF.gc b/test/decompiler/reference/jak2/levels/sewer/sew-gunturret_REF.gc index 8f6adf4140..5fad71b21a 100644 --- a/test/decompiler/reference/jak2/levels/sewer/sew-gunturret_REF.gc +++ b/test/decompiler/reference/jak2/levels/sewer/sew-gunturret_REF.gc @@ -1285,7 +1285,7 @@ ;; definition for method 140 of type pal-gun-turret (defmethod fire-turret! pal-gun-turret ((this pal-gun-turret) (arg0 symbol)) "@overrides Calls [[sew-gunturret::140]] but also customizes the turret flash via [[set-palcab-turret-flash!]]" - ((the-as (function sew-gunturret symbol none) (find-parent-method pal-gun-turret 140)) this arg0) + (call-parent-method this arg0) (set-palcab-turret-flash! 1.0) ) diff --git a/test/decompiler/reference/jak2/levels/sewer/sewer-obs2_REF.gc b/test/decompiler/reference/jak2/levels/sewer/sewer-obs2_REF.gc index 6e72a73c18..27d30d454a 100644 --- a/test/decompiler/reference/jak2/levels/sewer/sewer-obs2_REF.gc +++ b/test/decompiler/reference/jak2/levels/sewer/sewer-obs2_REF.gc @@ -153,7 +153,7 @@ ;; definition for method 10 of type sew-elevator (defmethod deactivate sew-elevator ((this sew-elevator)) (sound-stop (-> this sound-id)) - ((the-as (function elevator none) (find-parent-method sew-elevator 10)) this) + (call-parent-method this) (none) ) @@ -361,15 +361,11 @@ For example for an elevator pre-compute the distance between the first and last ) ;; definition for method 7 of type sew-valve -;; WARN: Return type mismatch process-drawable vs sew-valve. (defmethod relocate sew-valve ((this sew-valve) (arg0 int)) (if (nonzero? (-> this joint)) (&+! (-> this joint) arg0) ) - (the-as - sew-valve - ((the-as (function process-drawable int process-drawable) (find-parent-method sew-valve 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 11 of type sew-valve diff --git a/test/decompiler/reference/jak2/levels/stadium/racebike_REF.gc b/test/decompiler/reference/jak2/levels/stadium/racebike_REF.gc index 54615ab91a..4c0eda2969 100644 --- a/test/decompiler/reference/jak2/levels/stadium/racebike_REF.gc +++ b/test/decompiler/reference/jak2/levels/stadium/racebike_REF.gc @@ -805,15 +805,11 @@ ) ;; definition for method 7 of type vehicle-race-bike -;; WARN: Return type mismatch process-drawable vs vehicle-race-bike. (defmethod relocate vehicle-race-bike ((this vehicle-race-bike) (arg0 int)) (if (nonzero? (-> this steering-wheel)) (&+! (-> this steering-wheel) arg0) ) - (the-as - vehicle-race-bike - ((the-as (function process-drawable int process-drawable) (find-parent-method vehicle-race-bike 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 86 of type vehicle-race-bike 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 85ac0e2ef5..a0267b2fa1 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 @@ -1362,7 +1362,7 @@ ;; definition for method 10 of type hoverboard-training-manager (defmethod deactivate hoverboard-training-manager ((this hoverboard-training-manager)) (send-event *traffic-manager* 'restore-default-settings) - ((the-as (function process none) (find-parent-method hoverboard-training-manager 10)) this) + (call-parent-method this) (none) ) diff --git a/test/decompiler/reference/jak2/levels/stadium/stadium-obs_REF.gc b/test/decompiler/reference/jak2/levels/stadium/stadium-obs_REF.gc index 1ba01d0110..3f5969620e 100644 --- a/test/decompiler/reference/jak2/levels/stadium/stadium-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/stadium/stadium-obs_REF.gc @@ -1045,7 +1045,7 @@ This commonly includes things such as: (if (< 40960.0 (-> arg0 impulse)) (sound-play "rift-fall") ) - ((the-as (function rigid-body-object rigid-body-impact none) (find-parent-method rift-rider 45)) this arg0) + (call-parent-method this arg0) (none) ) @@ -1116,7 +1116,7 @@ This commonly includes things such as: ;; definition for method 10 of type rift-rider (defmethod deactivate rift-rider ((this rift-rider)) (sound-stop (-> this sound-id)) - ((the-as (function rigid-body-object none) (find-parent-method rift-rider 10)) this) + (call-parent-method this) (none) ) @@ -2161,7 +2161,7 @@ This commonly includes things such as: (send-event (handle->process (-> this hud)) 'hide-and-die) ) (kill-lightning this) - ((the-as (function process-focusable none) (find-parent-method stad-samos 10)) this) + (call-parent-method this) (none) ) 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 32ca1a736f..ae85d29cda 100644 --- a/test/decompiler/reference/jak2/levels/strip/strip-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/strip/strip-obs_REF.gc @@ -427,15 +427,11 @@ This commonly includes things such as: ) ;; definition for method 7 of type pitspikes -;; WARN: Return type mismatch strip-hazard vs pitspikes. (defmethod relocate pitspikes ((this pitspikes) (arg0 int)) (if (nonzero? (-> this spinner)) (&+! (-> this spinner) arg0) ) - (the-as - pitspikes - ((the-as (function strip-hazard int strip-hazard) (find-parent-method pitspikes 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 11 of type pitspikes diff --git a/test/decompiler/reference/jak2/levels/tomb/tomb-beetle_REF.gc b/test/decompiler/reference/jak2/levels/tomb/tomb-beetle_REF.gc index 64ca82bf4c..0e06130a28 100644 --- a/test/decompiler/reference/jak2/levels/tomb/tomb-beetle_REF.gc +++ b/test/decompiler/reference/jak2/levels/tomb/tomb-beetle_REF.gc @@ -343,7 +343,7 @@ :enter (behavior () (set! (-> self root trans quad) (-> self entity extra trans quad)) (quaternion-copy! (-> self root quat) (-> self entity quat)) - (let ((t9-2 (-> (the-as (state enemy) (find-parent-method tomb-beetle 27)) enter))) + (let ((t9-2 (-> (the-as (state enemy) (find-parent-state)) enter))) (if t9-2 (t9-2) ) diff --git a/test/decompiler/reference/jak2/levels/tomb/tomb-obs_REF.gc b/test/decompiler/reference/jak2/levels/tomb/tomb-obs_REF.gc index 7c70141a2c..c2b0ad15f6 100644 --- a/test/decompiler/reference/jak2/levels/tomb/tomb-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/tomb/tomb-obs_REF.gc @@ -1793,7 +1793,7 @@ This commonly includes things such as: ;; definition for method 10 of type tomb-plat-return (defmethod deactivate tomb-plat-return ((this tomb-plat-return)) (sound-stop (-> this sound-id)) - ((the-as (function process-drawable none) (find-parent-method tomb-plat-return 10)) this) + (call-parent-method this) (none) ) @@ -2160,7 +2160,7 @@ This commonly includes things such as: ;; definition for method 10 of type tomb-sphinx (defmethod deactivate tomb-sphinx ((this tomb-sphinx)) (sound-stop (-> this sound-id)) - ((the-as (function process-drawable none) (find-parent-method tomb-sphinx 10)) this) + (call-parent-method this) (none) ) diff --git a/test/decompiler/reference/jak2/levels/tomb/tomb-water_REF.gc b/test/decompiler/reference/jak2/levels/tomb/tomb-water_REF.gc index 34b298162b..7015651eec 100644 --- a/test/decompiler/reference/jak2/levels/tomb/tomb-water_REF.gc +++ b/test/decompiler/reference/jak2/levels/tomb/tomb-water_REF.gc @@ -676,7 +676,7 @@ This commonly includes things such as: ) ) :trans (behavior () - (let ((t9-1 (-> (the-as (state basebutton) (find-parent-method tomb-beetle-button 30)) trans))) + (let ((t9-1 (-> (the-as (state basebutton) (find-parent-state)) trans))) (if t9-1 (t9-1) ) diff --git a/test/decompiler/reference/jak2/levels/tomb/widow-extras_REF.gc b/test/decompiler/reference/jak2/levels/tomb/widow-extras_REF.gc index 2322821555..0d28047476 100644 --- a/test/decompiler/reference/jak2/levels/tomb/widow-extras_REF.gc +++ b/test/decompiler/reference/jak2/levels/tomb/widow-extras_REF.gc @@ -1274,12 +1274,11 @@ This commonly includes things such as: (if (nonzero? (-> this skid-part)) (kill-and-free-particles (-> this warning-spark-part)) ) - ((the-as (function process-drawable none) (find-parent-method widow-bomb 10)) this) + (call-parent-method this) (none) ) ;; definition for method 7 of type widow-bomb -;; WARN: Return type mismatch process-drawable vs widow-bomb. (defmethod relocate widow-bomb ((this widow-bomb) (arg0 int)) (if (nonzero? (-> this explode-part)) (&+! (-> this explode-part) arg0) @@ -1299,10 +1298,7 @@ This commonly includes things such as: (if (nonzero? (-> this spin-jm)) (&+! (-> this spin-jm) arg0) ) - (the-as - widow-bomb - ((the-as (function process-drawable int process-drawable) (find-parent-method widow-bomb 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for function widow-bomb-reaction @@ -1694,20 +1690,16 @@ This commonly includes things such as: (if (nonzero? (-> this explode-part)) (kill-and-free-particles (-> this explode-part)) ) - ((the-as (function process-drawable none) (find-parent-method tomb-boss-pillar 10)) this) + (call-parent-method this) (none) ) ;; definition for method 7 of type tomb-boss-pillar -;; WARN: Return type mismatch process-drawable vs tomb-boss-pillar. (defmethod relocate tomb-boss-pillar ((this tomb-boss-pillar) (arg0 int)) (if (nonzero? (-> this explode-part)) (&+! (-> this explode-part) arg0) ) - (the-as - tomb-boss-pillar - ((the-as (function process-drawable int process-drawable) (find-parent-method tomb-boss-pillar 7)) this arg0) - ) + (call-parent-method this arg0) ) ;; definition for method 11 of type tomb-boss-pillar diff --git a/test/decompiler/reference/jak2/levels/under/jellyfish_REF.gc b/test/decompiler/reference/jak2/levels/under/jellyfish_REF.gc index 3475f1fc0f..8b0f2d2b54 100644 --- a/test/decompiler/reference/jak2/levels/under/jellyfish_REF.gc +++ b/test/decompiler/reference/jak2/levels/under/jellyfish_REF.gc @@ -509,7 +509,7 @@ (defstate stare (jellyfish) :virtual #t :enter (behavior () - (let ((t9-1 (-> (the-as (state enemy) (find-parent-method jellyfish 35)) enter))) + (let ((t9-1 (-> (the-as (state enemy) (find-parent-state)) enter))) (if t9-1 (t9-1) ) @@ -1299,7 +1299,7 @@ ;; definition for method 10 of type jellyfish (defmethod deactivate jellyfish ((this jellyfish)) (sound-stop (-> this sound-id)) - ((the-as (function process-drawable none) (find-parent-method jellyfish 10)) this) + (call-parent-method this) (none) ) diff --git a/test/decompiler/reference/jak2/levels/under/under-obs_REF.gc b/test/decompiler/reference/jak2/levels/under/under-obs_REF.gc index 19df5a8b98..6f56de1e6e 100644 --- a/test/decompiler/reference/jak2/levels/under/under-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/under/under-obs_REF.gc @@ -983,7 +983,7 @@ This commonly includes things such as: ;; definition for method 29 of type under-buoy-plat ;; WARN: Return type mismatch int vs none. (defmethod rigid-body-object-method-29 under-buoy-plat ((this under-buoy-plat) (arg0 float)) - ((the-as (function rigid-body-object float none) (find-parent-method under-buoy-plat 29)) this arg0) + (call-parent-method this arg0) (rigid-body-platform-method-56 this (-> this orig-trans)) 0 (none) @@ -1775,7 +1775,7 @@ This commonly includes things such as: ;; definition for method 10 of type under-lift (defmethod deactivate under-lift ((this under-lift)) (sound-stop (-> this sound-id)) - ((the-as (function process-drawable none) (find-parent-method under-lift 10)) this) + (call-parent-method this) (none) ) diff --git a/test/decompiler/reference/jak2/levels/under/under-shoot-block_REF.gc b/test/decompiler/reference/jak2/levels/under/under-shoot-block_REF.gc index ad8ce908ba..d69be6f55e 100644 --- a/test/decompiler/reference/jak2/levels/under/under-shoot-block_REF.gc +++ b/test/decompiler/reference/jak2/levels/under/under-shoot-block_REF.gc @@ -2356,7 +2356,7 @@ ) ) ) - ((the-as (function process-drawable none) (find-parent-method under-shoot-block 10)) this) + (call-parent-method this) (none) )