mirror of
https://github.com/open-goal/jak-project
synced 2026-08-09 18:58:50 -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>
38 lines
1020 B
Common Lisp
38 lines
1020 B
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; name: hal-task.gc
|
|
;; name in dgo: hal-task
|
|
;; dgos: SEB, SWB, LKIDDOGE, UNB, CTYKORA
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
(defmethod reset-task! ((this halt-wait-spot))
|
|
(set! (-> this check-done) #f)
|
|
(set! (-> this which-spot) 0)
|
|
(set! (-> this num-spots) (the-as uint 1))
|
|
(none)
|
|
)
|
|
|
|
;; WARN: Return type mismatch symbol vs none.
|
|
(defmethod ai-task-method-11 ((this halt-wait-spot) (arg0 bot))
|
|
(let ((s4-0 (-> this which-spot)))
|
|
(if (logtest? *display-bot-marks* (bot-marks-controls bmc16))
|
|
(bot-debug-draw-spot-sphere
|
|
arg0
|
|
(the-as int (-> this num-spots))
|
|
(the-as (pointer uint) (-> this spot-indexes))
|
|
(the-as int (-> this spot-indexes s4-0))
|
|
)
|
|
)
|
|
(mem-copy!
|
|
(the-as pointer (-> arg0 spot))
|
|
(the-as pointer (-> arg0 course spots (-> this spot-indexes s4-0)))
|
|
20
|
|
)
|
|
)
|
|
(set! (-> arg0 root trans quad) (-> arg0 spot center quad))
|
|
((-> this check-done) this (the-as hal arg0))
|
|
(none)
|
|
)
|