mirror of
https://github.com/open-goal/jak-project
synced 2026-08-03 08:53:42 -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
131 lines
4.1 KiB
Common Lisp
Vendored
Generated
131 lines
4.1 KiB
Common Lisp
Vendored
Generated
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; definition of type blocking-plane
|
|
(deftype blocking-plane (process-drawable)
|
|
()
|
|
:heap-base #x40
|
|
:method-count-assert 20
|
|
:size-assert #xb0
|
|
:flag-assert #x14004000b0
|
|
(:states
|
|
blocking-plane-idle
|
|
)
|
|
)
|
|
|
|
;; definition for method 3 of type blocking-plane
|
|
(defmethod inspect blocking-plane ((obj blocking-plane))
|
|
(let ((t9-0 (method-of-type process-drawable inspect)))
|
|
(t9-0 obj)
|
|
)
|
|
obj
|
|
)
|
|
|
|
;; failed to figure out what this is:
|
|
(defskelgroup *ef-plane-sg* ef-plane ef-plane-lod0-jg ef-plane-idle-ja
|
|
((ef-plane-lod0-mg (meters 999999)))
|
|
:bounds (static-spherem 0 0 0 30)
|
|
)
|
|
|
|
;; failed to figure out what this is:
|
|
(defstate blocking-plane-idle (blocking-plane)
|
|
:code (behavior ()
|
|
(transform-post)
|
|
(loop
|
|
(logior! (-> self mask) (process-mask sleep))
|
|
(suspend)
|
|
)
|
|
)
|
|
)
|
|
|
|
;; definition for function blocking-plane-init-by-other
|
|
;; INFO: Used lq/sq
|
|
;; INFO: Return type mismatch object vs none.
|
|
(defbehavior blocking-plane-init-by-other blocking-plane ((arg0 curve-control) (arg1 int))
|
|
(if (or (not arg0) (logtest? (-> arg0 flags) (path-control-flag not-found)))
|
|
(deactivate self)
|
|
)
|
|
(let ((s5-0 (new 'static 'vector))
|
|
(gp-0 (new 'static 'vector))
|
|
)
|
|
0.0
|
|
(eval-path-curve-div! arg0 s5-0 (the float arg1) 'exact)
|
|
(eval-path-curve-div! arg0 gp-0 (+ 1.0 (the float arg1)) 'exact)
|
|
(let ((f30-1 (* 0.5 (vector-vector-distance s5-0 gp-0)))
|
|
(s4-1 (new 'process 'collide-shape self (collide-list-enum usually-hit-by-player)))
|
|
)
|
|
(let ((s3-1 (new 'process 'collide-shape-prim-mesh s4-1 (the-as uint 0) (the-as uint 0))))
|
|
(set! (-> s3-1 prim-core collide-as) (collide-kind wall-object))
|
|
(set! (-> s3-1 collide-with) (collide-kind target))
|
|
(set! (-> s3-1 prim-core action) (collide-action solid))
|
|
(set! (-> s3-1 prim-core offense) (collide-offense indestructible))
|
|
(set! (-> s3-1 transform-index) 3)
|
|
(set-vector! (-> s3-1 local-sphere) 0.0 0.0 0.0 (fmax 122880.0 f30-1))
|
|
(set-root-prim! s4-1 s3-1)
|
|
)
|
|
(set! (-> s4-1 nav-radius) (* 0.75 (-> s4-1 root-prim local-sphere w)))
|
|
(backup-collide-with-as s4-1)
|
|
(set! (-> self root) s4-1)
|
|
)
|
|
(let ((s4-2 (new-stack-matrix0)))
|
|
(vector+! (-> self root trans) s5-0 gp-0)
|
|
(vector-float*! (-> self root trans) (-> self root trans) 0.5)
|
|
(+! (-> self root trans y) 61440.0)
|
|
(vector-! (the-as vector (-> s4-2 vector)) gp-0 s5-0)
|
|
(set! (-> self root scale x)
|
|
(* 0.00024414062 (vector-normalize-ret-len! (the-as vector (-> s4-2 vector)) 1.0))
|
|
)
|
|
(set! (-> self root scale y) 30.0)
|
|
(set! (-> self root scale z) 0.0)
|
|
(set! (-> s4-2 vector 1 quad) (-> (new 'static 'vector :y 1.0 :w 1.0) quad))
|
|
(vector-cross! (-> s4-2 vector 2) (the-as vector (-> s4-2 vector)) (-> s4-2 vector 1))
|
|
(vector-normalize! (-> s4-2 vector 2) 1.0)
|
|
(matrix->quaternion (-> self root quat) s4-2)
|
|
)
|
|
)
|
|
(initialize-skeleton self *ef-plane-sg* '())
|
|
(logior! (-> self draw status) (draw-status skip-bones))
|
|
(go blocking-plane-idle)
|
|
(none)
|
|
)
|
|
|
|
;; definition for function blocking-plane-spawn
|
|
;; INFO: Return type mismatch int vs none.
|
|
(defbehavior blocking-plane-spawn process ((arg0 curve-control))
|
|
(cond
|
|
((or (not arg0) (logtest? (-> arg0 flags) (path-control-flag not-found)))
|
|
)
|
|
(else
|
|
(let ((s5-0 (the int (the float (+ (-> arg0 curve num-cverts) -1))))
|
|
(s4-0 0)
|
|
)
|
|
(while (< s4-0 s5-0)
|
|
(process-spawn blocking-plane arg0 s4-0 :to self)
|
|
(+! s4-0 2)
|
|
)
|
|
)
|
|
)
|
|
)
|
|
0
|
|
(none)
|
|
)
|
|
|
|
;; definition for function blocking-plane-destroy
|
|
;; INFO: Return type mismatch int vs none.
|
|
(defun blocking-plane-destroy ()
|
|
(with-pp
|
|
(let ((gp-0 (-> pp child)))
|
|
(while gp-0
|
|
(let ((s5-0 (ppointer->process gp-0)))
|
|
(set! gp-0 (-> gp-0 0 brother))
|
|
(if (type-type? (-> s5-0 type) blocking-plane)
|
|
(deactivate s5-0)
|
|
)
|
|
)
|
|
)
|
|
)
|
|
0
|
|
(none)
|
|
)
|
|
)
|