This commit is contained in:
water
2023-09-23 14:27:52 -04:00
parent 10971703a0
commit fff99dbd4b
93 changed files with 160 additions and 382 deletions
+1 -1
View File
@@ -3,4 +3,4 @@
# Directory of this script
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
"${DIR}"/../../build/decompiler/decompiler "${DIR}"/../../decompiler/config/jak1/jak1_config.jsonc "${DIR}"/../../iso_data "${DIR}"/../../decompiler_out --version ntsc_v1
"${DIR}"/../../build/decompiler/decompiler "${DIR}"/../../decompiler/config/jak1/jak1_config.jsonc "${DIR}"/../../iso_data "${DIR}"/../../decompiler_out --version ntsc_v1
+1 -5
View File
@@ -22,15 +22,11 @@
)
;; definition for method 7 of type enemy
;; WARN: Return type mismatch process-focusable vs enemy.
(defmethod relocate enemy ((obj enemy) (arg0 int))
(if (nonzero? (-> obj neck))
(&+! (-> obj neck) arg0)
)
(the-as
enemy
((the-as (function process-focusable int process-focusable) (find-parent-method enemy 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 117 of type enemy
+1 -1
View File
@@ -272,7 +272,7 @@
;; definition for method 10 of type talker
(defmethod deactivate talker ((obj talker))
(send-event (handle->process (-> obj voicebox)) 'die)
((the-as (function process none) (find-parent-method talker 10)) obj)
(call-parent-method obj)
(none)
)
+2 -2
View File
@@ -1320,7 +1320,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))
)
@@ -1886,7 +1886,7 @@ This commonly includes things such as:
;; definition for method 10 of type gem
(defmethod deactivate gem ((obj gem))
(+! (-> *game-info* live-gem-count) -1)
((the-as (function gem none) (find-parent-method gem 10)) obj)
(call-parent-method obj)
(none)
)
+1 -5
View File
@@ -103,13 +103,9 @@
)
;; definition for method 7 of type conveyor
;; WARN: Return type mismatch process-drawable vs conveyor.
(defmethod relocate conveyor ((obj conveyor) (new-addr int))
(&+! (-> obj sections) new-addr)
(the-as
conveyor
((the-as (function process-drawable int process-drawable) (find-parent-method conveyor 7)) obj new-addr)
)
(call-parent-method obj new-addr)
)
;; definition for method 22 of type conveyor
+1 -2
View File
@@ -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 ((obj elevator) (arg0 int))
(if (nonzero? (-> obj path-seq))
(&+! (-> obj path-seq) arg0)
)
(the-as elevator ((the-as (function base-plat int base-plat) (find-parent-method elevator 7)) obj arg0))
(call-parent-method obj arg0)
)
;; definition for method 40 of type elevator
+1 -8
View File
@@ -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 ((obj rigid-body-platform) (new-addr int))
(if (nonzero? (-> obj control-point-array))
(&+! (-> obj 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))
obj
new-addr
)
)
(call-parent-method obj new-addr)
)
;; definition for method 53 of type rigid-body-platform
+1 -2
View File
@@ -63,7 +63,7 @@
(if (nonzero? (-> obj flow))
(&+! (-> obj flow) arg0)
)
((the-as (function water-anim int water-anim) (find-parent-method water-anim 7)) obj arg0)
(call-parent-method obj arg0)
)
;; failed to figure out what this is:
@@ -380,7 +380,6 @@
;; definition for function water-anim-event-handler
;; INFO: Used lq/sq
;; WARN: Return type mismatch none vs object.
(defbehavior water-anim-event-handler water-anim ((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block))
(local-vars (v0-1 object))
(case arg2
+1 -1
View File
@@ -111,7 +111,7 @@
(if (nonzero? (-> obj path))
(&+! (-> obj path) arg0)
)
((the-as (function flow-control int flow-control) (find-parent-method flow-control 7)) obj arg0)
(call-parent-method obj arg0)
)
;; definition for method 9 of type flow-control
+6 -21
View File
@@ -776,10 +776,7 @@
)
)
)
((the-as (function editable-point editable-command none) (find-parent-method editable-point 28))
obj
(the-as editable-command arg0)
)
(call-parent-method obj 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 ((obj editable-light) (arg0 editable-array))
((the-as (function editable-light editable-array none) (find-parent-method editable-light 25)) obj arg0)
(call-parent-method obj arg0)
(when (nonzero? (-> obj id))
(let ((s5-1 (clear *temp-string*)))
(format s5-1 "delete from light where light_id=~D" (-> obj id))
@@ -1272,7 +1269,7 @@
(set! (-> s3-0 owner) (delete! obj (-> s3-0 owner)))
)
)
((the-as (function editable-face editable-array none) (find-parent-method editable-face 25)) obj arg0)
(call-parent-method obj arg0)
(none)
)
@@ -1302,13 +1299,7 @@
;; definition for method 27 of type editable-face
;; WARN: Return type mismatch editable-face vs editable.
(defmethod editable-method-27 editable-face ((obj 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)) obj arg0)
)
)
)
(let ((gp-1 (the-as editable-face (call-parent-method obj 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)))
@@ -1732,7 +1723,7 @@
(set! (-> s3-0 owner) (delete! obj (-> s3-0 owner)))
)
)
((the-as (function editable-plane editable-array none) (find-parent-method editable-plane 25)) obj arg0)
(call-parent-method obj arg0)
(none)
)
@@ -1746,13 +1737,7 @@
;; definition for method 27 of type editable-plane
;; WARN: Return type mismatch editable-plane vs editable.
(defmethod editable-method-27 editable-plane ((obj 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)) obj arg0)
)
)
)
(let ((gp-1 (the-as editable-plane (call-parent-method obj 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)))
+1 -5
View File
@@ -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 ((obj nav-graph-editor) (arg0 int))
(the-as
nav-graph-editor
((the-as (function process int none) (find-parent-method nav-graph-editor 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 60 of type nav-graph-editor
+2 -4
View File
@@ -71,7 +71,6 @@
)
;; definition for method 3 of type actor-group
;; INFO: this function exists in multiple non-identical object files
(defmethod inspect actor-group ((obj actor-group))
(format #t "[~8x] ~A~%" obj (-> obj type))
(format #t "~Tlength: ~D~%" (-> obj length))
@@ -531,7 +530,6 @@
)
;; definition for method 2 of type process
;; INFO: this function exists in multiple non-identical object files
(defmethod print process ((obj process))
(cond
((and (-> obj top-thread) (!= (-> obj status) 'dead))
@@ -569,7 +567,7 @@
;; definition for method 3 of type entity
(defmethod inspect entity ((obj entity))
((the-as (function entity entity) (find-parent-method entity 3)) obj)
(call-parent-method obj)
(format #t "~Ttrans: ~`vector`P~%" (-> obj trans))
(format #t "~Taid: ~D~%" (-> obj aid))
obj
@@ -587,7 +585,7 @@
;; definition for method 3 of type entity-actor
(defmethod inspect entity-actor ((obj entity-actor))
((the-as (function entity entity) (find-parent-method entity-actor 3)) obj)
(call-parent-method obj)
(format #t "~Tetype: ~A~%" (-> obj etype))
(format #t "~Ttask: ~d~%" (-> obj task))
(format #t "~Tkill-mask: #x~X : (" (-> obj kill-mask))
+1 -2
View File
@@ -1647,7 +1647,6 @@
)
;; definition for method 10 of type fail-mission
;; WARN: Return type mismatch process vs none.
(defmethod deactivate fail-mission ((obj 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)) obj)
(call-parent-method obj)
(none)
)
+1 -1
View File
@@ -813,7 +813,7 @@
;; WARN: Return type mismatch int vs none.
(defmethod dump-grid-info sphere-hash ((obj 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) obj)
(call-parent-method obj)
(new 'stack-no-clear 'vector)
(let ((f30-0 6144.0))
(set! (-> obj work temp-box-min quad) (-> (target-pos 0) quad))
+1 -1
View File
@@ -3357,7 +3357,7 @@
)
(set! (-> *setting-control* cam-default mode-name) #f)
(set-zero! *camera-smush-control*)
((the-as (function target none) (find-parent-method target 10)) obj)
(call-parent-method obj)
(none)
)
+1 -1
View File
@@ -1164,7 +1164,7 @@
;; definition for method 3 of type engine-minimap
(defmethod inspect engine-minimap ((obj engine-minimap))
((the-as (function engine-minimap engine-minimap) (find-parent-method engine-minimap 3)) obj)
(call-parent-method obj)
(let ((s5-0 0)
(s4-0 (the-as connection-pers (-> *minimap* engine alive-list)))
)
+1 -1
View File
@@ -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)) obj)
(call-parent-method obj)
(none)
)
+2 -6
View File
@@ -918,22 +918,18 @@ This commonly includes things such as:
;; definition for method 10 of type slider
(defmethod deactivate slider ((obj slider))
(sound-stop (the-as sound-id (-> obj sound-id)))
((the-as (function process-drawable none) (find-parent-method slider 10)) obj)
(call-parent-method obj)
(none)
)
;; definition for method 7 of type slider
;; WARN: Return type mismatch process-drawable vs slider.
(defmethod relocate slider ((obj slider) (arg0 int))
(dotimes (v1-0 4)
(if (nonzero? (-> obj l-bolts v1-0))
(&+! (-> obj l-bolts v1-0) arg0)
)
)
(the-as
slider
((the-as (function process-drawable int process-drawable) (find-parent-method slider 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 11 of type slider
+1 -5
View File
@@ -1873,7 +1873,6 @@
)
;; definition for method 7 of type juicer
;; WARN: Return type mismatch process-focusable vs juicer.
(defmethod relocate juicer ((obj juicer) (arg0 int))
(if (nonzero? (-> obj intro-path))
(&+! (-> obj intro-path) arg0)
@@ -1881,10 +1880,7 @@
(if (nonzero? (-> obj joint))
(&+! (-> obj joint) arg0)
)
(the-as
juicer
((the-as (function process-focusable int process-focusable) (find-parent-method juicer 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 115 of type juicer
+2 -2
View File
@@ -138,7 +138,7 @@ This commonly includes things such as:
;; definition for method 10 of type cboss-elevator
(defmethod deactivate cboss-elevator ((obj cboss-elevator))
(sound-stop (-> obj sound-id))
((the-as (function process-drawable none) (find-parent-method cboss-elevator 10)) obj)
(call-parent-method obj)
(none)
)
@@ -1491,7 +1491,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 ((obj 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)) obj)
(call-parent-method obj)
(set! (-> obj move) krew-boss-shot-move)
(set! (-> obj max-speed) 245760.0)
(set! (-> obj timeout) (seconds 5))
+3 -3
View File
@@ -101,7 +101,7 @@ This commonly includes things such as:
;; definition for method 10 of type cas-conveyor
(defmethod deactivate cas-conveyor ((obj cas-conveyor))
(sound-stop (-> obj sound-id))
((the-as (function conveyor none) (find-parent-method cas-conveyor 10)) obj)
(call-parent-method obj)
(none)
)
@@ -1056,7 +1056,7 @@ This commonly includes things such as:
;; definition for method 10 of type cas-elevator
(defmethod deactivate cas-elevator ((obj cas-elevator))
(sound-stop (-> obj sound-id))
((the-as (function elevator none) (find-parent-method cas-elevator 10)) obj)
(call-parent-method obj)
(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 ((obj cas-rot-blade))
(sound-stop (-> obj sound-id))
((the-as (function process-drawable none) (find-parent-method cas-rot-blade 10)) obj)
(call-parent-method obj)
(none)
)
+1 -1
View File
@@ -170,7 +170,7 @@
;; definition for method 10 of type cpad-elevator
(defmethod deactivate cpad-elevator ((obj cpad-elevator))
(sound-stop (-> obj sound-id))
((the-as (function elevator none) (find-parent-method cpad-elevator 10)) obj)
(call-parent-method obj)
(none)
)
+10 -14
View File
@@ -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 ((obj roboguard-level))
(sound-stop (-> obj roll-sound))
((the-as (function nav-enemy none) (find-parent-method roboguard-level 10)) obj)
(call-parent-method obj)
(none)
)
;; definition for method 7 of type roboguard-level
;; WARN: Return type mismatch nav-enemy vs roboguard-level.
(defmethod relocate roboguard-level ((obj roboguard-level) (arg0 int))
(the-as
roboguard-level
((the-as (function nav-enemy int nav-enemy) (find-parent-method roboguard-level 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 114 of type roboguard-level
+1 -3
View File
@@ -788,7 +788,6 @@
)
;; definition for method 3 of type ik-setup
;; INFO: this function exists in multiple non-identical object files
(defmethod inspect ik-setup ((obj ik-setup))
(when (not obj)
(set! obj obj)
@@ -2306,7 +2305,6 @@
)
;; definition for method 7 of type bombbot
;; WARN: Return type mismatch nav-enemy vs bombbot.
(defmethod relocate bombbot ((obj bombbot) (arg0 int))
(dotimes (v1-0 4)
(if (nonzero? (-> obj joint-ik v1-0))
@@ -2316,7 +2314,7 @@
(if (nonzero? (-> obj rigidbody))
(&+! (-> obj rigidbody) arg0)
)
(the-as bombbot ((the-as (function nav-enemy int nav-enemy) (find-parent-method bombbot 7)) obj arg0))
(call-parent-method obj arg0)
)
;; definition for method 114 of type bombbot
+2 -10
View File
@@ -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 ((obj cty-guard-turret) (arg0 int))
(if (nonzero? (-> obj jm-turret))
(&+! (-> obj jm-turret) arg0)
@@ -2067,10 +2066,7 @@ This commonly includes things such as:
(if (nonzero? (-> obj jm-gunsR))
(&+! (-> obj jm-gunsR) arg0)
)
(the-as
cty-guard-turret
((the-as (function process-focusable int process-focusable) (find-parent-method cty-guard-turret 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 32 of type cty-guard-turret
@@ -4097,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 ((obj barons-ship-lores) (arg0 int))
(if (nonzero? (-> obj paths 0))
(&+! (-> obj paths 0) arg0)
@@ -4108,10 +4103,7 @@ This commonly includes things such as:
(if (nonzero? (-> obj paths 2))
(&+! (-> obj paths 2) arg0)
)
(the-as
barons-ship-lores
((the-as (function process-drawable int process-drawable) (find-parent-method barons-ship-lores 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; failed to figure out what this is:
+1 -5
View File
@@ -3866,7 +3866,6 @@
)
;; definition for method 7 of type crimson-guard
;; WARN: Return type mismatch process-drawable vs crimson-guard.
(defmethod relocate crimson-guard ((obj crimson-guard) (arg0 int))
(if (nonzero? (-> obj joint))
(&+! (-> obj joint) arg0)
@@ -3874,10 +3873,7 @@
(if (nonzero? (-> obj l-control))
(&+! (-> obj l-control) arg0)
)
(the-as
crimson-guard
((the-as (function process-drawable int process-drawable) (find-parent-method crimson-guard 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 115 of type crimson-guard
@@ -1159,12 +1159,8 @@
)
;; definition for method 7 of type metalhead-predator
;; WARN: Return type mismatch process-drawable vs metalhead-predator.
(defmethod relocate metalhead-predator ((obj metalhead-predator) (arg0 int))
(the-as
metalhead-predator
((the-as (function process-drawable int process-drawable) (find-parent-method metalhead-predator 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 115 of type metalhead-predator
+6 -6
View File
@@ -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 ((obj bike-base))
((the-as (function object none) (find-parent-method bike-base 36)) obj)
(call-parent-method obj)
(when (logtest? (-> obj flags) (rigid-body-object-flag player-driving))
(if (zero? (-> obj roll-sound-id))
(set! (-> obj 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 ((obj bike-base))
((the-as (function object none) (find-parent-method bike-base 85)) obj)
(call-parent-method obj)
(when (logtest? (-> obj 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? (-> obj brake-r))
(&+! (-> obj brake-r) arg0)
)
((the-as (function object int bikea) (find-parent-method bikea 7)) obj arg0)
(call-parent-method obj arg0)
)
;; definition for method 32 of type bikea
@@ -1255,7 +1255,7 @@
(if (nonzero? (-> obj flap-r))
(&+! (-> obj flap-r) arg0)
)
((the-as (function object int bikeb) (find-parent-method bikeb 7)) obj arg0)
(call-parent-method obj arg0)
)
;; definition for method 32 of type bikeb
@@ -1434,7 +1434,7 @@
(if (nonzero? (-> obj spoiler-r))
(&+! (-> obj spoiler-r) arg0)
)
((the-as (function object int bikec) (find-parent-method bikec 7)) obj arg0)
(call-parent-method obj arg0)
)
;; definition for method 32 of type bikec
@@ -1591,7 +1591,7 @@
(if (nonzero? (-> obj turret-jm))
(&+! (-> obj turret-jm) arg0)
)
((the-as (function object int guard-bike) (find-parent-method guard-bike 7)) obj arg0)
(call-parent-method obj arg0)
)
;; definition for method 65 of type guard-bike
+4 -9
View File
@@ -1216,7 +1216,7 @@
(if (nonzero? (-> obj rudder-r))
(&+! (-> obj rudder-r) arg0)
)
((the-as (function object object cara) (find-parent-method cara 7)) obj arg0)
(call-parent-method obj arg0)
)
;; definition for method 32 of type cara
@@ -1382,7 +1382,7 @@
(if (nonzero? (-> obj fin-rr))
(&+! (-> obj fin-rr) arg0)
)
((the-as (function object object carb) (find-parent-method carb 7)) obj arg0)
(call-parent-method obj 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 ((obj carc) (arg0 int))
(if (nonzero? (-> obj steering-wheel))
(&+! (-> obj steering-wheel) arg0)
@@ -1549,7 +1548,7 @@
(if (nonzero? (-> obj fin2-rr))
(&+! (-> obj fin2-rr) arg0)
)
(the-as carc ((the-as (function object object carb) (find-parent-method carc 7)) obj arg0))
(call-parent-method obj arg0)
)
;; definition for method 32 of type carc
@@ -1704,7 +1703,7 @@
(if (nonzero? (-> obj turret-jm))
(&+! (-> obj turret-jm) arg0)
)
((the-as (function object object hellcat) (find-parent-method hellcat 7)) obj arg0)
(call-parent-method obj arg0)
)
;; definition for method 32 of type hellcat
@@ -1793,7 +1792,3 @@
0
(none)
)
@@ -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 ((obj vehicle-turret) (arg0 int))
(if (nonzero? (-> obj turret-jm))
(&+! (-> obj turret-jm) arg0)
)
(the-as
vehicle-turret
((the-as (function process-drawable int process-drawable) (find-parent-method vehicle-turret 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 30 of type vehicle-turret
@@ -339,7 +335,7 @@
;; definition for method 10 of type transport
(defmethod deactivate transport ((obj transport))
(sound-stop (-> obj ambient-sound-id))
((the-as (function process-drawable none) (find-parent-method transport 10)) obj)
(call-parent-method obj)
(none)
)
@@ -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 ((obj citizen-norm-rider))
((the-as (function vehicle-rider none) (find-parent-method citizen-norm-rider 33)) obj)
(call-parent-method obj)
(setup-masks (-> obj draw) 0 -1)
(setup-masks (-> obj 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 ((obj crimson-guard-rider))
((the-as (function vehicle-rider none) (find-parent-method crimson-guard-rider 33)) obj)
(call-parent-method obj)
(setup-masks (-> obj draw) 0 28)
(setup-masks (-> obj draw) 3 0)
(if (logtest? (-> obj flags) 4)
@@ -198,7 +198,7 @@
;; definition for method 10 of type vehicle
(defmethod deactivate vehicle ((obj vehicle))
(vehicle-method-110 obj)
((the-as (function rigid-body-object none) (find-parent-method vehicle 10)) obj)
(call-parent-method obj)
(none)
)
+2 -1
View File
@@ -390,6 +390,7 @@
)
;; definition for method 28 of type ashelin-shot
;; WARN: Return type mismatch object vs none.
(defmethod play-impact-sound ashelin-shot ((obj ashelin-shot) (arg0 projectile-options))
(let ((v1-0 arg0))
(cond
@@ -400,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)) obj arg0)
(call-parent-method obj arg0)
)
)
)
+1 -5
View File
@@ -1745,14 +1745,10 @@
)
;; definition for method 7 of type battle
;; WARN: Return type mismatch process-drawable vs battle.
(defmethod relocate battle ((obj battle) (arg0 int))
(&+! (-> obj spawners) arg0)
(&+! (-> obj allies) arg0)
(the-as
battle
((the-as (function process-drawable int process-drawable) (find-parent-method battle 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 29 of type battle
+1 -1
View File
@@ -836,7 +836,7 @@
;; definition for method 10 of type elec-gate
(defmethod deactivate elec-gate ((obj elec-gate))
(set-elec-scale-if-close! obj 0.0)
((the-as (function process-drawable none) (find-parent-method elec-gate 10)) obj)
(call-parent-method obj)
(none)
)
+4 -8
View File
@@ -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)) obj arg0)
(call-parent-method obj arg0)
)
)
)
@@ -198,7 +198,7 @@
;; WARN: Return type mismatch int vs none.
(defmethod init-proj-settings! centurion-shot ((obj 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)) obj)
(call-parent-method obj)
(set! (-> obj max-speed) 327680.0)
(set! (-> obj timeout) (seconds 1.25))
(none)
@@ -983,7 +983,7 @@
(defmethod dispose! centurion ((obj 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)) obj)
(call-parent-method obj)
(none)
)
@@ -1596,15 +1596,11 @@
)
;; definition for method 7 of type centurion
;; WARN: Return type mismatch process-focusable vs centurion.
(defmethod relocate centurion ((obj centurion) (arg0 int))
(if (nonzero? (-> obj joint))
(&+! (-> obj joint) arg0)
)
(the-as
centurion
((the-as (function process-focusable int process-focusable) (find-parent-method centurion 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 115 of type centurion
+1 -1
View File
@@ -1307,7 +1307,7 @@
(logior! (-> obj minimap flags) (minimap-flag fade-out))
(set! (-> obj minimap) #f)
)
((the-as (function nav-enemy none) (find-parent-method flitter 132)) obj)
(call-parent-method obj)
(none)
)
+1 -2
View File
@@ -1101,7 +1101,6 @@
)
;; definition for method 7 of type fodder
;; WARN: Return type mismatch nav-enemy vs fodder.
(defmethod relocate fodder ((obj fodder) (arg0 int))
(if (nonzero? (-> obj left-eye))
(&+! (-> obj left-eye) arg0)
@@ -1109,7 +1108,7 @@
(if (nonzero? (-> obj right-eye))
(&+! (-> obj right-eye) arg0)
)
(the-as fodder ((the-as (function nav-enemy int nav-enemy) (find-parent-method fodder 7)) obj arg0))
(call-parent-method obj arg0)
)
;; definition for function fodder-setup-eye-control
+1 -5
View File
@@ -1293,7 +1293,6 @@
)
;; definition for method 7 of type grenadier
;; WARN: Return type mismatch process-focusable vs grenadier.
(defmethod relocate grenadier ((obj grenadier) (arg0 int))
(if (nonzero? (-> obj joint))
(&+! (-> obj joint) arg0)
@@ -1303,10 +1302,7 @@
(&+! (-> obj hostile-path) arg0)
)
)
(the-as
grenadier
((the-as (function process-focusable int process-focusable) (find-parent-method grenadier 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 115 of type grenadier
+1 -1
View File
@@ -1489,7 +1489,7 @@
(logior! (-> obj minimap flags) (minimap-flag fade-out))
(set! (-> obj minimap) #f)
)
((the-as (function nav-enemy none) (find-parent-method grunt 132)) obj)
(call-parent-method obj)
(none)
)
@@ -4309,7 +4309,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 ((obj crimson-guard-level) (arg0 int))
(if (nonzero? (-> obj joint))
(&+! (-> obj joint) arg0)
@@ -4317,10 +4316,7 @@
(if (nonzero? (-> obj l-control))
(&+! (-> obj l-control) arg0)
)
(the-as
crimson-guard-level
((the-as (function nav-enemy int nav-enemy) (find-parent-method crimson-guard-level 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 203 of type crimson-guard-level
+2 -6
View File
@@ -860,20 +860,16 @@
(logior! (-> obj minimap flags) (minimap-flag fade-out))
(set! (-> obj minimap) #f)
)
((the-as (function enemy none) (find-parent-method hopper 132)) obj)
(call-parent-method obj)
(none)
)
;; definition for method 7 of type hopper
;; WARN: Return type mismatch process-focusable vs hopper.
(defmethod relocate hopper ((obj hopper) (arg0 int))
(if (nonzero? (-> obj path-intro))
(&+! (-> obj path-intro) arg0)
)
(the-as
hopper
((the-as (function process-focusable int process-focusable) (find-parent-method hopper 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 114 of type hopper
@@ -667,7 +667,7 @@
(defmethod enemy-method-135 crimson-guard-hover ((obj crimson-guard-hover) (arg0 int))
(if (and (zero? arg0) (logtest? #x4000000 (-> obj incoming penetrate-using)))
(sound-play "hover-take-hit")
((the-as (function enemy int sound-id) (find-parent-method crimson-guard-hover 135)) obj arg0)
(call-parent-method obj 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)
)
obj
arg0
arg1
arg2
arg3
)
(call-parent-method obj 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)
)
obj
arg0
arg1
arg2
arg3
)
(call-parent-method obj arg0 arg1 arg2 arg3)
)
(else
((the-as
(function enemy process int symbol event-message-block object)
(find-parent-method crimson-guard-hover 74)
)
obj
arg0
arg1
arg2
arg3
)
(call-parent-method obj arg0 arg1 arg2 arg3)
)
)
)
@@ -1379,7 +1352,7 @@
)
)
(else
((the-as (function hover-enemy vector none) (find-parent-method crimson-guard-hover 52)) obj arg0)
(call-parent-method obj arg0)
)
)
)
+1 -5
View File
@@ -1496,15 +1496,11 @@
)
;; definition for method 7 of type flamer
;; WARN: Return type mismatch process-drawable vs flamer.
(defmethod relocate flamer ((obj flamer) (arg0 int))
(if (nonzero? (-> obj flit-joint))
(&+! (-> obj flit-joint) arg0)
)
(the-as
flamer
((the-as (function process-drawable int process-drawable) (find-parent-method flamer 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 115 of type flamer
@@ -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 ((obj hover-enemy-manager) (arg0 int))
(when (-> obj formation)
(if (nonzero? (-> obj formation))
@@ -297,10 +296,7 @@
(if (nonzero? (-> obj path))
(&+! (-> obj path) arg0)
)
(the-as
hover-enemy-manager
((the-as (function process int process) (find-parent-method hover-enemy-manager 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 17 of type hover-enemy-manager
@@ -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)
)
@@ -681,7 +681,6 @@
)
;; definition for method 7 of type hover-formation
;; WARN: Return type mismatch basic vs hover-formation.
(defmethod relocate hover-formation ((obj hover-formation) (arg0 int))
(if (nonzero? (-> obj formation))
(&+! (-> obj formation) arg0)
@@ -689,7 +688,7 @@
(if (nonzero? (-> obj path))
(&+! (-> obj path) arg0)
)
(the-as hover-formation ((the-as (function basic int basic) (find-parent-method hover-formation 7)) obj arg0))
(call-parent-method obj arg0)
)
;; definition for method 15 of type hover-formation
+1 -1
View File
@@ -537,7 +537,7 @@
)
)
(else
((the-as (function enemy vector none) (find-parent-method wasp 52)) obj arg0)
(call-parent-method obj arg0)
)
)
)
+1 -5
View File
@@ -1231,15 +1231,11 @@
)
;; definition for method 7 of type metalmonk
;; WARN: Return type mismatch process-focusable vs metalmonk.
(defmethod relocate metalmonk ((obj metalmonk) (arg0 int))
(if (nonzero? (-> obj intro-path))
(&+! (-> obj intro-path) arg0)
)
(the-as
metalmonk
((the-as (function process-focusable int process-focusable) (find-parent-method metalmonk 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 115 of type metalmonk
+2 -7
View File
@@ -44,7 +44,7 @@
;; WARN: Return type mismatch int vs none.
(defmethod init-proj-settings! spyder-shot ((obj 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)) obj)
(call-parent-method obj)
(set! (-> obj max-speed) 307200.0)
(set! (-> obj timeout) (seconds 0.267))
(none)
@@ -752,7 +752,6 @@
)
;; definition for method 3 of type ik-setup
;; INFO: this function exists in multiple non-identical object files
(defmethod inspect ik-setup ((obj ik-setup))
(when (not obj)
(set! obj obj)
@@ -1393,7 +1392,6 @@
)
;; definition for method 7 of type spyder
;; WARN: Return type mismatch process-focusable vs spyder.
(defmethod relocate spyder ((obj spyder) (arg0 int))
(if (nonzero? (-> obj joint))
(&+! (-> obj joint) arg0)
@@ -1403,10 +1401,7 @@
(&+! (-> obj joint-ik v1-4) arg0)
)
)
(the-as
spyder
((the-as (function process-focusable int process-focusable) (find-parent-method spyder 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 115 of type spyder
+5 -5
View File
@@ -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 ((obj com-elevator))
(sound-stop (-> obj sound-id))
((the-as (function elevator none) (find-parent-method com-elevator 10)) obj)
(call-parent-method obj)
(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 ((obj tomb-trans-elevator))
(sound-stop (-> obj sound-id))
((the-as (function com-elevator none) (find-parent-method tomb-trans-elevator 10)) obj)
(call-parent-method obj)
(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 ((obj 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)) obj)
(call-parent-method obj)
(set! (-> obj sound-id) (new-sound-id))
(none)
)
+1 -1
View File
@@ -1366,7 +1366,7 @@
(if (nonzero? (-> obj explode-part))
(kill-and-free-particles (-> obj explode-part))
)
((the-as (function process-focusable none) (find-parent-method spydroid 10)) obj)
(call-parent-method obj)
(none)
)
+1 -1
View File
@@ -1605,7 +1605,7 @@
(defmethod deactivate race-manager ((obj 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)) obj)
(call-parent-method obj)
(none)
)
+1 -4
View File
@@ -542,7 +542,6 @@ This commonly includes things such as:
)
;; definition for method 3 of type keira-npc
;; INFO: this function exists in multiple non-identical object files
(defmethod inspect keira-npc ((obj keira-npc))
(when (not obj)
(set! obj obj)
@@ -556,7 +555,6 @@ This commonly includes things such as:
)
;; definition for method 35 of type keira-npc
;; INFO: this function exists in multiple non-identical object files
(defmethod get-art-elem keira-npc ((obj keira-npc))
"Checks various things such the current actor, task status, etc to determine the right art-group data to use
@returns the appropriate [[art-element]] for the given NPC"
@@ -571,7 +569,6 @@ This commonly includes things such as:
)
;; definition for method 33 of type keira-npc
;; INFO: this function exists in multiple non-identical object files
;; WARN: Return type mismatch int vs none.
(defmethod init-art! keira-npc ((obj keira-npc))
"@see [[initialize-skeleton]]"
@@ -864,7 +861,7 @@ This commonly includes things such as:
)
)
)
((the-as (function process-taskable none) (find-parent-method youngsamos-npc 32)) obj)
(call-parent-method obj)
(none)
)
+1 -1
View File
@@ -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 ((obj dig-sinking-plat) (arg0 float))
((the-as (function rigid-body-platform float none) (find-parent-method dig-sinking-plat 29)) obj arg0)
(call-parent-method obj arg0)
(rigid-body-platform-method-56 obj (-> obj anchor-point))
0
(none)
+1 -1
View File
@@ -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 ((obj dig-tipping-rock) (arg0 float))
((the-as (function rigid-body-platform float none) (find-parent-method dig-tipping-rock 29)) obj arg0)
(call-parent-method obj arg0)
(rigid-body-platform-method-56 obj (-> obj anchor-point))
0
(none)
+2 -9
View File
@@ -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 ((obj drill-barons-ship-turret) (arg0 int))
(when (-> obj jmod)
(if (nonzero? (-> obj jmod))
@@ -1122,13 +1121,7 @@
(&+! (-> obj 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))
obj
arg0
)
)
(call-parent-method obj 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 ((obj 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)) obj)
(call-parent-method obj)
(set! (-> obj attack-mode) 'drill-ship-shot)
(set! (-> obj move) guard-shot-move)
(set! (-> obj max-speed) 737280.0)
+3 -7
View File
@@ -531,7 +531,7 @@ This commonly includes things such as:
;; definition for method 10 of type drill-elevator
(defmethod deactivate drill-elevator ((obj drill-elevator))
(sound-stop (-> obj sound-id))
((the-as (function process-drawable none) (find-parent-method drill-elevator 10)) obj)
(call-parent-method obj)
(none)
)
@@ -946,15 +946,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 ((obj fire-floor) (arg0 int))
(if (nonzero? (-> obj part-off))
(&+! (-> obj part-off) arg0)
)
(the-as
fire-floor
((the-as (function process-drawable int process-drawable) (find-parent-method fire-floor 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 10 of type fire-floor
@@ -963,7 +959,7 @@ For example for an elevator pre-compute the distance between the first and last
(if (nonzero? (-> obj part-off))
(kill-and-free-particles (-> obj part-off))
)
((the-as (function process-drawable none) (find-parent-method fire-floor 10)) obj)
(call-parent-method obj)
(none)
)
+2 -2
View File
@@ -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))
)
+2 -4
View File
@@ -992,11 +992,9 @@
;; definition for method 10 of type ginsu
(defmethod deactivate ginsu ((obj ginsu))
(when (nonzero? (-> obj blade-part))
(let ((a0-1 (-> obj blade-part)))
((the-as (function sparticle-launch-control none) (method-of-object a0-1 kill-and-free-particles)) a0-1)
(if (nonzero? (-> obj blade-part))
(kill-and-free-particles (-> obj blade-part))
)
)
(if (-> obj blade-sound-playing)
(sound-stop (-> obj blade-sound))
)
+1 -1
View File
@@ -438,7 +438,7 @@ This commonly includes things such as:
(send-event (handle->process (-> obj hud)) 'hide-and-die)
)
(sound-stop (-> obj sound-id))
((the-as (function process-focusable none) (find-parent-method forest-youngsamos 10)) obj)
(call-parent-method obj)
(none)
)
+1 -5
View File
@@ -1506,12 +1506,8 @@
)
;; definition for method 7 of type predator
;; WARN: Return type mismatch process-focusable vs predator.
(defmethod relocate predator ((obj predator) (arg0 int))
(the-as
predator
((the-as (function process-focusable int process-focusable) (find-parent-method predator 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 167 of type predator
+1 -2
View File
@@ -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 ((obj wren) (arg0 int))
(dotimes (v1-0 2)
(when (-> obj fly-curve v1-0)
@@ -457,7 +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)) obj arg0))
(call-parent-method obj arg0)
)
;; definition for method 11 of type wren
+2 -6
View File
@@ -418,7 +418,7 @@ This commonly includes things such as:
;; definition for method 10 of type fort-missile-target
(defmethod deactivate fort-missile-target ((obj fort-missile-target))
(sound-stop (the-as sound-id (-> obj sound-id)))
((the-as (function process-drawable none) (find-parent-method fort-missile-target 10)) obj)
(call-parent-method obj)
(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 ((obj fort-missile) (arg0 int))
(if (nonzero? (-> obj part-doom))
(&+! (-> obj part-doom) arg0)
)
(the-as
fort-missile
((the-as (function process-drawable int process-drawable) (find-parent-method fort-missile 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 11 of type fort-missile
@@ -380,7 +380,7 @@
(defmethod deactivate fort-roboscreen ((obj fort-roboscreen))
(disable *screen-filter*)
(set-roboscreen-alpha! 0.0)
((the-as (function process-drawable none) (find-parent-method fort-roboscreen 10)) obj)
(call-parent-method obj)
(none)
)
+1 -5
View File
@@ -1068,7 +1068,6 @@
)
;; definition for method 7 of type fort-robotank
;; WARN: Return type mismatch process-drawable vs fort-robotank.
(defmethod relocate fort-robotank ((obj fort-robotank) (arg0 int))
(if (nonzero? (-> obj barrel-part))
(&+! (-> obj barrel-part) arg0)
@@ -1117,10 +1116,7 @@
)
)
)
(the-as
fort-robotank
((the-as (function process-drawable int process-drawable) (find-parent-method fort-robotank 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 11 of type fort-robotank
+1 -1
View File
@@ -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))
)
+1 -6
View File
@@ -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 ((obj fort-elec-belt-inst))
(sound-stop (-> obj sound-id))
((the-as (function process-drawable none) (find-parent-method fort-elec-belt-inst 10)) obj)
(call-parent-method obj)
(none)
)
@@ -669,7 +669,6 @@ This commonly includes things such as:
)
;; definition for method 3 of type fort-conveyor
;; INFO: this function exists in multiple non-identical object files
(defmethod inspect fort-conveyor ((obj fort-conveyor))
(when (not obj)
(set! obj obj)
@@ -689,14 +688,12 @@ This commonly includes things such as:
)
;; definition for method 22 of type fort-conveyor
;; INFO: this function exists in multiple non-identical object files
(defmethod get-art-group fort-conveyor ((obj fort-conveyor))
"@returns The respective [[art-group]] for the [[conveyor]]"
(art-group-get-by-name *level* "skel-fort-conveyor" (the-as (pointer uint32) #f))
)
;; definition for method 23 of type fort-conveyor
;; INFO: this function exists in multiple non-identical object files
;; WARN: Return type mismatch collide-shape-moving vs none.
(defmethod reset-root! fort-conveyor ((obj fort-conveyor))
"Re-initializes the `root` [[trsqv]]"
@@ -727,7 +724,6 @@ This commonly includes things such as:
)
;; definition for method 24 of type fort-conveyor
;; INFO: this function exists in multiple non-identical object files
;; WARN: Return type mismatch vector vs none.
(defmethod init! fort-conveyor ((obj fort-conveyor))
"Initializes defaults for things like the `speed` and `belt-radius`"
@@ -741,7 +737,6 @@ This commonly includes things such as:
)
;; definition for method 25 of type fort-conveyor
;; INFO: this function exists in multiple non-identical object files
(defmethod set-and-get-ambient-sound! fort-conveyor ((obj fort-conveyor))
"So long as [[actor-option::16]] is not set, fetch the [[ambient-sound]] for the [[conveyor]]
and return it as well. Otherwise, set it to `0`"
+1 -1
View File
@@ -209,7 +209,7 @@
)
(training-manager-method-24 obj)
(training-manager-method-25 obj)
((the-as (function process none) (find-parent-method training-manager 10)) obj)
(call-parent-method obj)
(none)
)
+2 -6
View File
@@ -1796,22 +1796,18 @@
(kill-and-free-particles (-> obj score-part s5-0))
)
)
((the-as (function process none) (find-parent-method whack-a-metal 10)) obj)
(call-parent-method obj)
(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 ((obj whack-a-metal) (arg0 int))
(dotimes (v1-0 2)
(if (nonzero? (-> obj score-part v1-0))
(&+! (-> obj 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)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 29 of type whack-a-metal
+1 -5
View File
@@ -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 ((obj metalhead-spawner) (arg0 int))
(dotimes (v1-0 19)
(if (nonzero? (-> obj path-tbl v1-0))
(&+! (-> obj path-tbl v1-0) arg0)
)
)
(the-as
metalhead-spawner
((the-as (function process int process) (find-parent-method metalhead-spawner 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 11 of type metalhead-spawner
+3 -3
View File
@@ -3519,7 +3519,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))
)
@@ -3529,7 +3529,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)
)
@@ -3553,7 +3553,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)
)
+1 -5
View File
@@ -1908,15 +1908,11 @@
)
;; definition for method 7 of type rhino
;; WARN: Return type mismatch process-focusable vs rhino.
(defmethod relocate rhino ((obj rhino) (arg0 int))
(if (nonzero? (-> obj path-intro))
(&+! (-> obj path-intro) arg0)
)
(the-as
rhino
((the-as (function process-focusable int process-focusable) (find-parent-method rhino 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 115 of type rhino
+2 -5
View File
@@ -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 ((obj 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))
obj
arg0
)
(call-parent-method obj arg0)
)
(none)
)
+1 -5
View File
@@ -1588,17 +1588,13 @@
)
;; definition for method 7 of type mammoth
;; WARN: Return type mismatch process-focusable vs mammoth.
(defmethod relocate mammoth ((obj mammoth) (arg0 int))
(dotimes (v1-0 4)
(if (nonzero? (-> obj joint-ik v1-0))
(&+! (-> obj joint-ik v1-0) arg0)
)
)
(the-as
mammoth
((the-as (function process-focusable int process-focusable) (find-parent-method mammoth 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 114 of type mammoth
+1 -1
View File
@@ -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)
)
+1 -1
View File
@@ -1039,7 +1039,7 @@ This commonly includes things such as:
(defmethod deactivate pal-rot-gun ((obj pal-rot-gun))
(sound-stop (-> obj sound-id))
(sound-stop (-> obj shot-sound-id))
((the-as (function process-drawable none) (find-parent-method pal-rot-gun 10)) obj)
(call-parent-method obj)
(none)
)
+1 -5
View File
@@ -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 ((obj rapid-gunner) (arg0 int))
(if (nonzero? (-> obj joint))
(&+! (-> obj joint) arg0)
)
(the-as
rapid-gunner
((the-as (function process-focusable int process-focusable) (find-parent-method rapid-gunner 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 115 of type rapid-gunner
+1 -1
View File
@@ -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 ((obj sinking-plat) (arg0 float))
((the-as (function rigid-body-platform float none) (find-parent-method sinking-plat 29)) obj arg0)
(call-parent-method obj arg0)
(rigid-body-platform-method-56 obj (-> obj anchor-point))
0
(none)
+1 -3
View File
@@ -436,7 +436,6 @@
)
;; definition for method 3 of type ik-setup
;; INFO: this function exists in multiple non-identical object files
(defmethod inspect ik-setup ((obj ik-setup))
(when (not obj)
(set! obj obj)
@@ -2328,7 +2327,6 @@
)
;; definition for method 7 of type hosehead
;; WARN: Return type mismatch none vs hosehead.
(defmethod relocate hosehead ((obj hosehead) (arg0 int))
(if (nonzero? (-> obj head-joint-mod))
(&+! (-> obj head-joint-mod) arg0)
@@ -2338,7 +2336,7 @@
(&+! (-> obj joint-ik v1-4) arg0)
)
)
(the-as hosehead ((the-as (function process-drawable int none) (find-parent-method hosehead 7)) obj arg0))
(call-parent-method obj arg0)
)
;; definition for method 115 of type hosehead
+1 -1
View File
@@ -1279,7 +1279,7 @@
;; definition for method 140 of type pal-gun-turret
(defmethod fire-turret! pal-gun-turret ((obj 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)) obj arg0)
(call-parent-method obj arg0)
(set-palcab-turret-flash! 1.0)
)
+2 -6
View File
@@ -153,7 +153,7 @@
;; definition for method 10 of type sew-elevator
(defmethod deactivate sew-elevator ((obj sew-elevator))
(sound-stop (-> obj sound-id))
((the-as (function elevator none) (find-parent-method sew-elevator 10)) obj)
(call-parent-method obj)
(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 ((obj sew-valve) (arg0 int))
(if (nonzero? (-> obj joint))
(&+! (-> obj joint) arg0)
)
(the-as
sew-valve
((the-as (function process-drawable int process-drawable) (find-parent-method sew-valve 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 11 of type sew-valve
+1 -5
View File
@@ -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 ((obj vehicle-race-bike) (arg0 int))
(if (nonzero? (-> obj steering-wheel))
(&+! (-> obj steering-wheel) arg0)
)
(the-as
vehicle-race-bike
((the-as (function process-drawable int process-drawable) (find-parent-method vehicle-race-bike 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 86 of type vehicle-race-bike
+1 -1
View File
@@ -1362,7 +1362,7 @@
;; definition for method 10 of type hoverboard-training-manager
(defmethod deactivate hoverboard-training-manager ((obj hoverboard-training-manager))
(send-event *traffic-manager* 'restore-default-settings)
((the-as (function process none) (find-parent-method hoverboard-training-manager 10)) obj)
(call-parent-method obj)
(none)
)
+3 -3
View File
@@ -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)) obj arg0)
(call-parent-method obj arg0)
(none)
)
@@ -1116,7 +1116,7 @@ This commonly includes things such as:
;; definition for method 10 of type rift-rider
(defmethod deactivate rift-rider ((obj rift-rider))
(sound-stop (-> obj sound-id))
((the-as (function rigid-body-object none) (find-parent-method rift-rider 10)) obj)
(call-parent-method obj)
(none)
)
@@ -2161,7 +2161,7 @@ This commonly includes things such as:
(send-event (handle->process (-> obj hud)) 'hide-and-die)
)
(kill-lightning obj)
((the-as (function process-focusable none) (find-parent-method stad-samos 10)) obj)
(call-parent-method obj)
(none)
)
+1 -5
View File
@@ -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 ((obj pitspikes) (arg0 int))
(if (nonzero? (-> obj spinner))
(&+! (-> obj spinner) arg0)
)
(the-as
pitspikes
((the-as (function strip-hazard int strip-hazard) (find-parent-method pitspikes 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 11 of type pitspikes
+1 -1
View File
@@ -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)
)
+2 -2
View File
@@ -1791,7 +1791,7 @@ This commonly includes things such as:
;; definition for method 10 of type tomb-plat-return
(defmethod deactivate tomb-plat-return ((obj tomb-plat-return))
(sound-stop (-> obj sound-id))
((the-as (function process-drawable none) (find-parent-method tomb-plat-return 10)) obj)
(call-parent-method obj)
(none)
)
@@ -2158,7 +2158,7 @@ This commonly includes things such as:
;; definition for method 10 of type tomb-sphinx
(defmethod deactivate tomb-sphinx ((obj tomb-sphinx))
(sound-stop (-> obj sound-id))
((the-as (function process-drawable none) (find-parent-method tomb-sphinx 10)) obj)
(call-parent-method obj)
(none)
)
+1 -1
View File
@@ -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)
)
+4 -12
View File
@@ -1274,12 +1274,11 @@ This commonly includes things such as:
(if (nonzero? (-> obj skid-part))
(kill-and-free-particles (-> obj warning-spark-part))
)
((the-as (function process-drawable none) (find-parent-method widow-bomb 10)) obj)
(call-parent-method obj)
(none)
)
;; definition for method 7 of type widow-bomb
;; WARN: Return type mismatch process-drawable vs widow-bomb.
(defmethod relocate widow-bomb ((obj widow-bomb) (arg0 int))
(if (nonzero? (-> obj explode-part))
(&+! (-> obj explode-part) arg0)
@@ -1299,10 +1298,7 @@ This commonly includes things such as:
(if (nonzero? (-> obj spin-jm))
(&+! (-> obj spin-jm) arg0)
)
(the-as
widow-bomb
((the-as (function process-drawable int process-drawable) (find-parent-method widow-bomb 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for function widow-bomb-reaction
@@ -1694,20 +1690,16 @@ This commonly includes things such as:
(if (nonzero? (-> obj explode-part))
(kill-and-free-particles (-> obj explode-part))
)
((the-as (function process-drawable none) (find-parent-method tomb-boss-pillar 10)) obj)
(call-parent-method obj)
(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 ((obj tomb-boss-pillar) (arg0 int))
(if (nonzero? (-> obj explode-part))
(&+! (-> obj explode-part) arg0)
)
(the-as
tomb-boss-pillar
((the-as (function process-drawable int process-drawable) (find-parent-method tomb-boss-pillar 7)) obj arg0)
)
(call-parent-method obj arg0)
)
;; definition for method 11 of type tomb-boss-pillar
+2 -2
View File
@@ -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)
)
@@ -1296,7 +1296,7 @@
;; definition for method 10 of type jellyfish
(defmethod deactivate jellyfish ((obj jellyfish))
(sound-stop (-> obj sound-id))
((the-as (function process-drawable none) (find-parent-method jellyfish 10)) obj)
(call-parent-method obj)
(none)
)
+2 -2
View File
@@ -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 ((obj under-buoy-plat) (arg0 float))
((the-as (function rigid-body-object float none) (find-parent-method under-buoy-plat 29)) obj arg0)
(call-parent-method obj arg0)
(rigid-body-platform-method-56 obj (-> obj 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 ((obj under-lift))
(sound-stop (-> obj sound-id))
((the-as (function process-drawable none) (find-parent-method under-lift 10)) obj)
(call-parent-method obj)
(none)
)
+1 -1
View File
@@ -2353,7 +2353,7 @@
)
)
)
((the-as (function process-drawable none) (find-parent-method under-shoot-block 10)) obj)
(call-parent-method obj)
(none)
)