mirror of
https://github.com/open-goal/jak-project.git
synced 2024-10-20 21:27:52 -04:00
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>
153 lines
3.2 KiB
Common Lisp
153 lines
3.2 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; name: traffic-h.gc
|
|
;; name in dgo: traffic-h
|
|
;; dgos: ENGINE, GAME
|
|
|
|
;; +++traffic-danger-type
|
|
(defenum traffic-danger-type
|
|
:type uint8
|
|
(tdt0 0)
|
|
(tdt1 1)
|
|
(tdt2 2)
|
|
(tdt3 3)
|
|
(tdt4 4)
|
|
(tdt5 5)
|
|
(tdt6 6)
|
|
(tdt7 7)
|
|
)
|
|
;; ---traffic-danger-type
|
|
|
|
;; +++traffic-danger-flags
|
|
(defenum traffic-danger-flags
|
|
:type uint8
|
|
:bitfield #t
|
|
(tdf0 0)
|
|
)
|
|
;; ---traffic-danger-flags
|
|
|
|
;; +++traffic-h:traffic-type
|
|
(defenum traffic-type
|
|
:type uint8
|
|
(citizen-norm-1 0)
|
|
(citizen-chick 1)
|
|
(citizen-fat 2)
|
|
(citizen-norm-2 3)
|
|
(crimson-guard-0 4)
|
|
(tt5 5)
|
|
(crimson-guard-1 6)
|
|
(crimson-guard-2 7)
|
|
(metalhead-grunt 8)
|
|
(metalhead-flitter 9)
|
|
(metalhead-predator 10)
|
|
(bikea 11)
|
|
(bikeb 12)
|
|
(bikec 13)
|
|
(cara 14)
|
|
(carb 15)
|
|
(carc 16)
|
|
(tt17 17)
|
|
(guard-bike 18)
|
|
(hellcat 19)
|
|
(traffic-type-20 20)
|
|
(traffic-type-21 21)
|
|
)
|
|
;; ---traffic-h:traffic-type
|
|
|
|
;; +++traffic-h:traffic-spawn-flags
|
|
(defenum traffic-spawn-flags
|
|
:type uint32
|
|
:bitfield #t
|
|
(trsflags-00)
|
|
(trsflags-01)
|
|
(trsflags-02)
|
|
(dark-guard)
|
|
(trsflags-04)
|
|
(trsflags-05)
|
|
(trsflags-06)
|
|
(trsflags-07)
|
|
)
|
|
;; ---traffic-h:traffic-spawn-flags
|
|
|
|
;; NOTE - for default-menu
|
|
(define-extern traffic-start (function none))
|
|
(define-extern traffic-kill (function none))
|
|
|
|
;; NOTE - for vehicle-rider
|
|
(define-extern lwide-entity-hack (function none))
|
|
|
|
(define-extern *traffic-alert-level-force* symbol)
|
|
|
|
(declare-type nav-mesh basic)
|
|
(declare-type nav-branch structure)
|
|
(declare-type traffic-manager process)
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
(define *traffic-manager* (the-as traffic-manager #f))
|
|
|
|
(define *ctywide-entity* (the-as entity #f))
|
|
|
|
(define *lwide-entity* (the-as entity #f))
|
|
|
|
(define *race-vehicle-entity* (the-as entity-actor #f))
|
|
|
|
(deftype traffic-danger-info (structure)
|
|
((sphere sphere :inline)
|
|
(velocity vector :inline)
|
|
(handle handle)
|
|
(notify-radius float)
|
|
(danger-level float)
|
|
(decay-rate float)
|
|
(flags traffic-danger-flags)
|
|
(danger-type traffic-danger-type)
|
|
)
|
|
)
|
|
|
|
|
|
(deftype traffic-suppression-params (structure)
|
|
((bbox bounding-box :inline)
|
|
(duration time-frame)
|
|
(id int8)
|
|
)
|
|
(:methods
|
|
(try-creating-new-suppression-box (_type_) symbol)
|
|
(create-or-update-suppression-box (_type_) symbol)
|
|
(has-valid-id? (_type_) none)
|
|
(kill-suppression-box (_type_) none)
|
|
)
|
|
)
|
|
|
|
|
|
;; WARN: Return type mismatch symbol vs none.
|
|
(defmethod has-valid-id? ((this traffic-suppression-params))
|
|
(!= (-> this id) -1)
|
|
(none)
|
|
)
|
|
|
|
(deftype traffic-object-spawn-params (structure)
|
|
((object-type traffic-type)
|
|
(behavior uint64)
|
|
(id uint32)
|
|
(nav-mesh nav-mesh)
|
|
(nav-branch nav-branch)
|
|
(position vector :inline)
|
|
(rotation quaternion :inline)
|
|
(velocity vector :inline)
|
|
(handle handle)
|
|
(guard-type uint8)
|
|
(user-data uint32)
|
|
(flags traffic-spawn-flags)
|
|
(proc process)
|
|
)
|
|
)
|
|
|
|
(deftype mystery-traffic-object-spawn-params (structure)
|
|
"TODO - what is this!"
|
|
((params traffic-object-spawn-params :inline :offset-assert 0)
|
|
(vector vector 3 :inline :offset-assert 112)
|
|
))
|
|
|
|
(define-extern traffic-object-spawn (function process traffic-object-spawn-params process-drawable))
|