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>
63 lines
1.6 KiB
Common Lisp
63 lines
1.6 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; name: ticky.gc
|
|
;; name in dgo: ticky
|
|
;; dgos: GAME, COMMON, L1
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
(deftype ticky (structure)
|
|
((delay-til-ramp time-frame)
|
|
(delay-til-timeout time-frame)
|
|
(starting-time time-frame)
|
|
(last-tick-time time-frame)
|
|
)
|
|
(:methods
|
|
(sleep (_type_ time-frame) none)
|
|
(reached-delay? (_type_ time-frame) symbol)
|
|
(completed? (_type_) symbol)
|
|
)
|
|
)
|
|
|
|
|
|
(defmethod sleep ((this ticky) (arg0 time-frame))
|
|
(set-time! (-> this starting-time))
|
|
(set! (-> this delay-til-timeout) arg0)
|
|
(set! (-> this delay-til-ramp) (max 0 (+ arg0 (seconds -4))))
|
|
(set! (-> this last-tick-time) 0)
|
|
0
|
|
(none)
|
|
)
|
|
|
|
(defmethod completed? ((this ticky))
|
|
(let ((gp-0 #f))
|
|
(let ((v1-2 (- (current-time) (-> this starting-time))))
|
|
(cond
|
|
((>= v1-2 (-> this delay-til-timeout))
|
|
(set! gp-0 #t)
|
|
)
|
|
(else
|
|
(let* ((f0-1 (fmin 1.0 (/ (the float (max 0 (- v1-2 (-> this delay-til-ramp))))
|
|
(the float (- (-> this delay-til-timeout) (-> this delay-til-ramp)))
|
|
)
|
|
)
|
|
)
|
|
(v1-7 (the int (lerp 105.0 41.0 f0-1)))
|
|
)
|
|
(when (time-elapsed? (-> this last-tick-time) v1-7)
|
|
(set-time! (-> this last-tick-time))
|
|
(sound-play "stopwatch")
|
|
)
|
|
)
|
|
)
|
|
)
|
|
)
|
|
gp-0
|
|
)
|
|
)
|
|
|
|
(defmethod reached-delay? ((this ticky) (arg0 time-frame))
|
|
(time-elapsed? (-> this starting-time) arg0)
|
|
)
|