mirror of
https://github.com/open-goal/jak-project
synced 2026-08-08 18:44:15 -04:00
ManDude
cd68cb671e
Major change to how `deftype` shows up in our code: - the decompiler will no longer emit the `offset-assert`, `method-count-assert`, `size-assert` and `flag-assert` parameters. There are extremely few cases where having this in the decompiled code is helpful, as the types there come from `all-types` which already has those parameters. This also doesn't break type consistency because: - the asserts aren't compared. - the first step of the test uses `all-types`, which has the asserts, which will throw an error if they're bad. - the decompiler won't emit the `heap-base` parameter unless necessary now. - the decompiler will try its hardest to turn a fixed-offset field into an `overlay-at` field. It falls back to the old offset if all else fails. - `overlay-at` now supports field "dereferencing" to specify the offset that's within a field that's a structure, e.g.: ```lisp (deftype foobar (structure) ((vec vector :inline) (flags int32 :overlay-at (-> vec w)) ) ) ``` in this structure, the offset of `flags` will be 12 because that is the final offset of `vec`'s `w` field within this structure. - **removed ID from all method declarations.** IDs are only ever automatically assigned now. Fixes #3068. - added an `:overlay` parameter to method declarations, in order to declare a new method that goes on top of a previously-defined method. Syntax is `:overlay <method-name>`. Please do not ever use this. - added `state-methods` list parameter. This lets you quickly specify a list of states to be put in the method table. Same syntax as the `states` list parameter. The decompiler will try to put as many states in this as it can without messing with the method ID order. Also changes `defmethod` to make the first type definition (before the arguments) optional. The type can now be inferred from the first argument. Fixes #3093. --------- Co-authored-by: Hat Kid <6624576+Hat-Kid@users.noreply.github.com>
105 lines
2.9 KiB
Common Lisp
Vendored
Generated
105 lines
2.9 KiB
Common Lisp
Vendored
Generated
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; definition of type drawable-ambient
|
|
(deftype drawable-ambient (drawable)
|
|
((ambient entity-ambient :offset 8)
|
|
)
|
|
(:methods
|
|
(execute-ambient (_type_ vector) none)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type drawable-ambient
|
|
(defmethod inspect ((this drawable-ambient))
|
|
(format #t "[~8x] ~A~%" this (-> this type))
|
|
(format #t "~Tid: ~D~%" (-> this id))
|
|
(format #t "~Tbsphere: ~`vector`P~%" (-> this bsphere))
|
|
(format #t "~Tambient: ~A~%" (-> this ambient))
|
|
this
|
|
)
|
|
|
|
;; definition of type drawable-tree-ambient
|
|
(deftype drawable-tree-ambient (drawable-tree)
|
|
()
|
|
)
|
|
|
|
;; definition of type drawable-inline-array-ambient
|
|
(deftype drawable-inline-array-ambient (drawable-inline-array)
|
|
((data drawable-ambient 1 :inline)
|
|
(pad uint32)
|
|
)
|
|
)
|
|
|
|
;; definition for method 10 of type drawable-tree-ambient
|
|
;; INFO: Return type mismatch int vs none.
|
|
(defmethod draw ((this drawable-tree-ambient) (arg0 drawable-tree-ambient) (arg1 display-frame))
|
|
0
|
|
(none)
|
|
)
|
|
|
|
;; definition for method 16 of type drawable-tree-ambient
|
|
(defmethod unpack-vis ((this drawable-tree-ambient) (arg0 (pointer int8)) (arg1 (pointer int8)))
|
|
arg1
|
|
)
|
|
|
|
;; definition of type level-hint
|
|
(deftype level-hint (process)
|
|
((text-id-to-display text-id)
|
|
(sound-to-play string)
|
|
(trans vector)
|
|
(sound-id sound-id)
|
|
(mode symbol)
|
|
(total-time time-frame)
|
|
(total-off-time time-frame)
|
|
(last-time time-frame)
|
|
(voicebox handle)
|
|
)
|
|
(:methods
|
|
(print-text (_type_) none)
|
|
(appeared-for-long-enough? (_type_) symbol)
|
|
)
|
|
(:states
|
|
(level-hint-ambient-sound string)
|
|
(level-hint-error string string)
|
|
level-hint-exit
|
|
level-hint-normal
|
|
(level-hint-sidekick string)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type level-hint
|
|
(defmethod inspect ((this level-hint))
|
|
(let ((t9-0 (method-of-type process inspect)))
|
|
(t9-0 this)
|
|
)
|
|
(format #t "~T~Ttext-id-to-display: ~D~%" (-> this text-id-to-display))
|
|
(format #t "~T~Tsound-to-play: ~A~%" (-> this sound-to-play))
|
|
(format #t "~T~Ttrans: #<vector @ #x~X>~%" (-> this trans))
|
|
(format #t "~T~Tsound-id: ~D~%" (-> this sound-id))
|
|
(format #t "~T~Tmode: ~A~%" (-> this mode))
|
|
(format #t "~T~Ttotal-time: ~D~%" (-> this total-time))
|
|
(format #t "~T~Ttotal-off-time: ~D~%" (-> this total-off-time))
|
|
(format #t "~T~Tlast-time: ~D~%" (-> this last-time))
|
|
(format #t "~T~Tvoicebox: ~D~%" (-> this voicebox))
|
|
this
|
|
)
|
|
|
|
;; definition of type ambient-list
|
|
(deftype ambient-list (structure)
|
|
((num-items int32)
|
|
(items drawable-ambient 2048)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type ambient-list
|
|
(defmethod inspect ((this ambient-list))
|
|
(format #t "[~8x] ~A~%" this 'ambient-list)
|
|
(format #t "~Tnum-items: ~D~%" (-> this num-items))
|
|
(format #t "~Titems[2048] @ #x~X~%" (-> this items))
|
|
this
|
|
)
|
|
|
|
;; failed to figure out what this is:
|
|
0
|