mirror of
https://github.com/open-goal/jak-project
synced 2026-05-29 16:45:10 -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>
67 lines
2.1 KiB
Common Lisp
Vendored
Generated
67 lines
2.1 KiB
Common Lisp
Vendored
Generated
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; definition of type process-taskable
|
|
(deftype process-taskable (process-focusable)
|
|
((task game-task-control)
|
|
(ambient ambient-control :inline)
|
|
(neck-joint-index int32)
|
|
(talk-message text-id)
|
|
(bounce-away symbol)
|
|
(will-talk symbol)
|
|
(look-at-me symbol)
|
|
(hide-during-movie symbol)
|
|
(talk-distance meters)
|
|
(talk-height meters)
|
|
(last-talk time-frame)
|
|
(want-to-say time-frame)
|
|
(birth-time time-frame)
|
|
(slave handle)
|
|
)
|
|
(:state-methods
|
|
hide
|
|
idle
|
|
(active game-task-event)
|
|
(play-game game-task-event)
|
|
)
|
|
(:methods
|
|
(process-taskable-method-31 (_type_) none)
|
|
(process-taskable-method-32 (_type_) none)
|
|
(init-art! (_type_) none)
|
|
(process-taskable-method-34 (_type_) symbol)
|
|
(get-art-elem (_type_) art-element)
|
|
(process-taskable-method-36 (_type_) none)
|
|
(process-taskable-method-37 (_type_) none)
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type process-taskable
|
|
(defmethod inspect ((this process-taskable))
|
|
(when (not this)
|
|
(set! this this)
|
|
(goto cfg-4)
|
|
)
|
|
(let ((t9-0 (method-of-type process-focusable inspect)))
|
|
(t9-0 this)
|
|
)
|
|
(format #t "~2Ttask: ~A~%" (-> this task))
|
|
(format #t "~2Tambient: #<ambient-control @ #x~X>~%" (-> this ambient))
|
|
(format #t "~2Tneck-joint-index: ~D~%" (-> this neck-joint-index))
|
|
(format #t "~2Ttalk-message: ~D~%" (-> this talk-message))
|
|
(format #t "~2Tbounce-away: ~A~%" (-> this bounce-away))
|
|
(format #t "~2Twill-talk: ~A~%" (-> this will-talk))
|
|
(format #t "~2Tlook-at-me: ~A~%" (-> this look-at-me))
|
|
(format #t "~2Thide-during-movie: ~A~%" (-> this hide-during-movie))
|
|
(format #t "~2Ttalk-distance: (meters ~m)~%" (-> this talk-distance))
|
|
(format #t "~2Ttalk-height: (meters ~m)~%" (-> this talk-height))
|
|
(format #t "~2Tlast-talk: ~D~%" (-> this last-talk))
|
|
(format #t "~2Twant-to-say: ~D~%" (-> this want-to-say))
|
|
(format #t "~2Tbirth-time: ~D~%" (-> this birth-time))
|
|
(format #t "~2Tslave: ~D~%" (-> this slave))
|
|
(label cfg-4)
|
|
this
|
|
)
|
|
|
|
;; failed to figure out what this is:
|
|
0
|