mirror of
https://github.com/open-goal/jak-project
synced 2026-06-26 10:31:54 -04:00
ManDude
fe491c2b5e
Previously, `object` and `none` were both top-level types. This made decompilation rather messy as they have no LCA and resulted in a lot of variables coming out as type `none` which is very very wrong and additionally there were plenty of casts to `object`. This changes it so `none` becomes a child of `object` (it is still represented by `NullType` which remains unusable in compilation). This change makes `object` the sole top-level type, and the type that can represent *any* GOAL object. I believe this matches the original GOAL built-in type structure. A function that has a return type of `object` can now return an integer or a `none` at the same time. However, keep in mind that the return value of `(none)` is still undefined, just as before. This also makes a cast to `object` meaningless in 90% of the situations it showed up in (as every single thing is already an `object`) and the decompiler will no longer emit them. Casts to `none` are also reduced. Yay! Additionally, state handlers also don't get the final `(none)` printed out anymore. The return type of a state handler is completely meaningless outside the event handler (which is return type `object` anyway) so there are no limitations on what the last form needs to be. I did this instead of making them return `object` to trick the decompiler into not trying to output a variable to be used as a return value (internally, in the decompiler they still have return type `none`, but they have `object` elsewhere). Fixes #1703 Fixes #830 Fixes #928
122 lines
3.9 KiB
Common Lisp
Vendored
Generated
122 lines
3.9 KiB
Common Lisp
Vendored
Generated
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; this file is debug only
|
|
(declare-file (debug))
|
|
|
|
;; failed to figure out what this is:
|
|
(defpartgroup group-part-tester :id 105 :bounds (static-bspherem 0 0 0 1) :parts ((sp-item 56) (sp-item 57)))
|
|
|
|
;; definition of type part-tester
|
|
(deftype part-tester (process)
|
|
((root trsqv :offset-assert 112)
|
|
(part sparticle-launch-control :offset-assert 116)
|
|
(old-group sparticle-launch-group :offset-assert 120)
|
|
)
|
|
:heap-base #x100
|
|
:method-count-assert 14
|
|
:size-assert #x7c
|
|
:flag-assert #xe0100007c
|
|
)
|
|
|
|
;; definition for method 3 of type part-tester
|
|
(defmethod inspect part-tester ((obj part-tester))
|
|
(let ((t9-0 (method-of-type process inspect)))
|
|
(t9-0 obj)
|
|
)
|
|
(format #t "~T~Troot: ~A~%" (-> obj root))
|
|
(format #t "~T~Tpart: ~A~%" (-> obj part))
|
|
(format #t "~T~Told-group: ~A~%" (-> obj old-group))
|
|
obj
|
|
)
|
|
|
|
;; definition for symbol *part-tester-name*, type string
|
|
(define *part-tester-name* (the-as string #f))
|
|
|
|
;; definition for method 10 of type part-tester
|
|
(defmethod deactivate part-tester ((obj part-tester))
|
|
(if (nonzero? (-> obj part))
|
|
(kill-and-free-particles (-> obj part))
|
|
)
|
|
((method-of-type process deactivate) obj)
|
|
(none)
|
|
)
|
|
|
|
;; failed to figure out what this is:
|
|
(defstate part-tester-idle (part-tester)
|
|
:code (behavior ()
|
|
(loop
|
|
(let ((gp-0 (entity-by-name *part-tester-name*)))
|
|
(when gp-0
|
|
(let ((s5-0 (-> gp-0 extra process)))
|
|
(if (and s5-0 (type-type? (-> s5-0 type) process-drawable) (nonzero? (-> (the-as process-drawable s5-0) root)))
|
|
(set! (-> self root trans quad) (-> (the-as process-drawable s5-0) root trans quad))
|
|
(set! (-> self root trans quad) (-> gp-0 extra trans quad))
|
|
)
|
|
)
|
|
)
|
|
)
|
|
(add-debug-x
|
|
#t
|
|
(bucket-id debug-no-zbuf)
|
|
(-> self root trans)
|
|
(the-as rgba (new 'static 'rgba :r #xff :g #xff :b #xff :a #x80))
|
|
)
|
|
(let ((gp-1 (-> *part-group-id-table* 105)))
|
|
(let ((s5-1 (-> self root trans)))
|
|
(when (!= gp-1 (-> self old-group))
|
|
(when (nonzero? (-> self part))
|
|
(kill-and-free-particles (-> self part))
|
|
(set! (-> self heap-cur) (&-> (-> self part) type))
|
|
)
|
|
(set! (-> self part) (create-launch-control gp-1 self))
|
|
)
|
|
(if (nonzero? (-> self part))
|
|
(spawn (-> self part) (cond
|
|
((logtest? (-> gp-1 flags) (sp-group-flag screen-space))
|
|
*zero-vector*
|
|
)
|
|
(else
|
|
(empty)
|
|
s5-1
|
|
)
|
|
)
|
|
)
|
|
)
|
|
)
|
|
(set! (-> self old-group) gp-1)
|
|
)
|
|
(suspend)
|
|
)
|
|
)
|
|
)
|
|
|
|
;; definition for function part-tester-init-by-other
|
|
;; INFO: Used lq/sq
|
|
;; INFO: Return type mismatch object vs none.
|
|
(defbehavior part-tester-init-by-other process-drawable ((arg0 vector))
|
|
(set! (-> self root) (new 'process 'trsqv))
|
|
(set! (-> self root trans quad) (-> arg0 quad))
|
|
(set! *part-tester* (the-as part-tester (process->ppointer self)))
|
|
(go part-tester-idle)
|
|
(none)
|
|
)
|
|
|
|
;; definition (perm) for symbol *debug-part-dead-pool*, type dead-pool
|
|
(define-perm *debug-part-dead-pool* dead-pool (new 'debug 'dead-pool 1 #x10000 '*debug-part-dead-pool*))
|
|
|
|
;; definition for function start-part
|
|
;; INFO: Return type mismatch (pointer process) vs none.
|
|
(defun start-part ()
|
|
(kill-by-type part-tester *active-pool*)
|
|
(process-spawn
|
|
part-tester
|
|
(if *anim-tester*
|
|
(-> *anim-tester* 0 root trans)
|
|
(target-pos 0)
|
|
)
|
|
:from *debug-part-dead-pool*
|
|
)
|
|
(none)
|
|
)
|