mirror of
https://github.com/open-goal/jak-project
synced 2026-08-02 00:34:13 -04:00
[decompiler] as-type and font method support (#3855)
Add support for `as-type` macro, and detecting inline font methods. This works in all three games but I've only updated jak 3's goal_src for now. Eventually I will go back and work through the others, but I want to get more decompiler features in first.  --------- Co-authored-by: water111 <awaterford1111445@gmail.com>
This commit is contained in:
+14
-61
@@ -385,19 +385,9 @@
|
||||
(return (the-as penetrate (-> v1-0 penetrate-using)))
|
||||
)
|
||||
)
|
||||
(let* ((gp-0 arg0)
|
||||
(v1-3 (if (type? gp-0 process-drawable)
|
||||
gp-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-3 (as-type arg0 process-drawable)))
|
||||
(when v1-3
|
||||
(let* ((gp-1 (-> v1-3 root))
|
||||
(v1-4 (if (type? gp-1 collide-shape)
|
||||
(the-as collide-shape gp-1)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-4 (as-type (-> v1-3 root) collide-shape)))
|
||||
(if v1-4
|
||||
(return (the-as penetrate (logior (-> v1-4 penetrate-using) (penetrate generic-attack))))
|
||||
)
|
||||
@@ -436,12 +426,7 @@
|
||||
;; WARN: Return type mismatch int vs none.
|
||||
(defmethod enemy-method-62 ((this enemy))
|
||||
(when (not (logtest? (enemy-flag lock-focus) (-> this enemy-flags)))
|
||||
(let* ((s4-0 (handle->process (-> this incoming attacker-handle)))
|
||||
(s5-0 (if (type? s4-0 process-focusable)
|
||||
s4-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((s5-0 (the-as process (as-type (handle->process (-> this incoming attacker-handle)) process-focusable))))
|
||||
(when (enemy-method-53 this (the-as process-focusable s5-0))
|
||||
(enemy-method-63 this (the-as process-focusable s5-0) (the-as enemy-aware #f))
|
||||
(logior! (-> this focus flags) (enemy-flag look-at-focus))
|
||||
@@ -675,11 +660,7 @@
|
||||
(set! (-> this root penetrated-by) (the-as penetrate -1))
|
||||
(enemy-method-49 this)
|
||||
)
|
||||
(let ((s5-0 (if (type? arg0 process-focusable)
|
||||
arg0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((s5-0 (the-as process (as-type arg0 process-focusable))))
|
||||
(when (enemy-method-53 this (the-as process-focusable s5-0))
|
||||
(let ((v1-10 (handle->process (-> this focus handle))))
|
||||
(when (or (= s5-0 v1-10) (and (not (logtest? (enemy-flag lock-focus) (-> this enemy-flags)))
|
||||
@@ -1438,12 +1419,7 @@
|
||||
(while (!= v1-4 (-> *collide-player-list* alive-list-end))
|
||||
(let ((v1-5 (the-as collide-shape (-> (the-as connection v1-4) param1))))
|
||||
(when (logtest? s4-0 (-> v1-5 root-prim prim-core collide-as))
|
||||
(let* ((s2-0 (-> v1-5 process))
|
||||
(a1-1 (if (type? s2-0 process-focusable)
|
||||
(the-as process-focusable s2-0)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((a1-1 (as-type (-> v1-5 process) process-focusable)))
|
||||
(if (and a1-1 (and a1-1 (not (logtest? (-> a1-1 focus-status) (focus-status disable dead)))) (!= this a1-1))
|
||||
(update-target-awareness! this a1-1 gp-0)
|
||||
)
|
||||
@@ -1465,12 +1441,7 @@
|
||||
(while (!= v1-19 (-> *collide-hit-by-player-list* alive-list-end))
|
||||
(let ((v1-20 (the-as collide-shape (-> (the-as connection v1-19) param1))))
|
||||
(when (logtest? s4-0 (-> v1-20 root-prim prim-core collide-as))
|
||||
(let* ((s2-1 (-> v1-20 process))
|
||||
(a1-3 (if (type? s2-1 process-focusable)
|
||||
(the-as process-focusable s2-1)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((a1-3 (as-type (-> v1-20 process) process-focusable)))
|
||||
(if (and a1-3 (and a1-3 (not (logtest? (-> a1-3 focus-status) (focus-status disable dead)))) (!= this a1-3))
|
||||
(update-target-awareness! this a1-3 gp-0)
|
||||
)
|
||||
@@ -1491,12 +1462,7 @@
|
||||
(while (!= v1-32 (-> *collide-hit-by-others-list* alive-list-end))
|
||||
(let ((v1-33 (the-as collide-shape (-> (the-as connection v1-32) param1))))
|
||||
(when (logtest? s4-0 (-> v1-33 root-prim prim-core collide-as))
|
||||
(let* ((s2-2 (-> v1-33 process))
|
||||
(a1-5 (if (type? s2-2 process-focusable)
|
||||
(the-as process-focusable s2-2)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((a1-5 (as-type (-> v1-33 process) process-focusable)))
|
||||
(if (and a1-5 (and a1-5 (not (logtest? (-> a1-5 focus-status) (focus-status disable dead)))) (!= this a1-5))
|
||||
(update-target-awareness! this a1-5 gp-0)
|
||||
)
|
||||
@@ -1690,20 +1656,11 @@
|
||||
)
|
||||
((= arg2 'touched)
|
||||
(when (logtest? (-> this enemy-flags) (enemy-flag auto-reset-penetrate))
|
||||
(let* ((s3-1 arg0)
|
||||
(v1-20 (if (type? s3-1 process-drawable)
|
||||
(the-as process-drawable s3-1)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-20 (as-type arg0 process-drawable)))
|
||||
(when v1-20
|
||||
(let* ((s3-2 (-> v1-20 root))
|
||||
(a1-4 (if (type? s3-2 collide-shape)
|
||||
s3-2
|
||||
)
|
||||
)
|
||||
(s3-3 (-> arg3 param 0))
|
||||
)
|
||||
(let ((a1-4 (the-as trsqv (as-type (-> v1-20 root) collide-shape)))
|
||||
(s3-3 (-> arg3 param 0))
|
||||
)
|
||||
(if (and a1-4
|
||||
s3-3
|
||||
((method-of-type touching-shapes-entry prims-touching-action?)
|
||||
@@ -2080,13 +2037,9 @@
|
||||
|
||||
;; definition for method 75 of type enemy
|
||||
(defmethod enemy-method-75 ((this enemy) (arg0 process) (arg1 event-message-block))
|
||||
(let* ((touch-entry (the-as touching-shapes-entry (-> arg1 param 0)))
|
||||
(s2-0 arg0)
|
||||
(s3-0 (if (type? s2-0 process-focusable)
|
||||
(the-as process-focusable s2-0)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((touch-entry (the-as touching-shapes-entry (-> arg1 param 0)))
|
||||
(s3-0 (as-type arg0 process-focusable))
|
||||
)
|
||||
(when (and (the-as uint touch-entry) s3-0)
|
||||
(cond
|
||||
((and (focus-test? this dangerous)
|
||||
|
||||
+9
-40
@@ -285,57 +285,31 @@
|
||||
)
|
||||
)
|
||||
(let ((f0-0 320.0))
|
||||
(let ((v1-2 gp-0))
|
||||
(set! (-> v1-2 scale) 0.75)
|
||||
)
|
||||
(set-scale! gp-0 0.75)
|
||||
(case (-> this message channel)
|
||||
(((gui-channel notice))
|
||||
(cond
|
||||
((logtest? (-> this message flags) 128)
|
||||
(let ((v1-9 gp-0)
|
||||
(a1-1 36)
|
||||
(a0-4 140)
|
||||
)
|
||||
(set! (-> v1-9 origin x) (the float a1-1))
|
||||
(set! (-> v1-9 origin y) (the float a0-4))
|
||||
)
|
||||
(set-origin! gp-0 36 140)
|
||||
)
|
||||
(else
|
||||
(let ((v1-10 gp-0))
|
||||
(set! (-> v1-10 scale) 0.6)
|
||||
)
|
||||
(let ((v1-11 gp-0)
|
||||
(a1-2 36)
|
||||
(a0-6 160)
|
||||
)
|
||||
(set! (-> v1-11 origin x) (the float a1-2))
|
||||
(set! (-> v1-11 origin y) (the float a0-6))
|
||||
)
|
||||
(set-scale! gp-0 0.6)
|
||||
(set-origin! gp-0 36 160)
|
||||
)
|
||||
)
|
||||
(set! f0-0 160.0)
|
||||
)
|
||||
)
|
||||
(let ((v1-14 gp-0))
|
||||
(set! (-> v1-14 width) (the float 440))
|
||||
)
|
||||
(let ((v1-15 gp-0))
|
||||
(set! (-> v1-15 height) (the float 140))
|
||||
)
|
||||
(set-width! gp-0 440)
|
||||
(set-height! gp-0 140)
|
||||
(set! (-> gp-0 flags) (font-flags shadow kerning middle large))
|
||||
(if (logtest? (-> this message flags) 32)
|
||||
(set! (-> gp-0 alpha) (-> this interp))
|
||||
(set! (-> gp-0 alpha) 1.0)
|
||||
)
|
||||
(when (logtest? (-> this message flags) 64)
|
||||
(let ((s4-0 gp-0)
|
||||
(s3-0 36)
|
||||
(v1-27 (the int (lerp-scale 400.0 f0-0 (-> this interp) 0.0 1.0)))
|
||||
)
|
||||
(set! (-> s4-0 origin x) (the float s3-0))
|
||||
(set! (-> s4-0 origin y) (the float v1-27))
|
||||
(if (logtest? (-> this message flags) 64)
|
||||
(set-origin! gp-0 36 (the int (lerp-scale 400.0 f0-0 (-> this interp) 0.0 1.0)))
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((s4-1 print-game-text)
|
||||
(a0-11 (lookup-text! *common-text* (-> this message text-message) #f))
|
||||
@@ -419,12 +393,7 @@
|
||||
:exit (behavior ()
|
||||
(let ((gp-0 (-> self message on-close)))
|
||||
(when gp-0
|
||||
(let* ((s5-0 (handle->process (-> self voicebox)))
|
||||
(v1-5 (if (type? s5-0 process-drawable)
|
||||
(the-as process-drawable s5-0)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-5 (as-type (handle->process (-> self voicebox)) process-drawable)))
|
||||
(script-eval gp-0 :vector (if v1-5
|
||||
(-> v1-5 root trans)
|
||||
)
|
||||
|
||||
+2
-12
@@ -740,19 +740,9 @@
|
||||
;; WARN: Return type mismatch int vs none.
|
||||
(defmethod look-at! ((this joint-mod) (arg0 vector) (arg1 symbol) (arg2 process))
|
||||
(when (= arg1 'attacking)
|
||||
(let* ((s2-0 arg2)
|
||||
(s1-0 (if (type? s2-0 process-drawable)
|
||||
(the-as process-drawable s2-0)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((s1-0 (as-type arg2 process-drawable)))
|
||||
(when s1-0
|
||||
(let* ((s0-0 (-> s1-0 fact))
|
||||
(s2-1 (if (type? s0-0 fact-info-enemy)
|
||||
(the-as fact-info-enemy s0-0)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((s2-1 (as-type (-> s1-0 fact) fact-info-enemy)))
|
||||
(when s2-1
|
||||
(when (< (vector-vector-distance (-> this process root trans) (-> s1-0 root trans)) (-> s2-1 cam-notice-dist))
|
||||
(set-time! (-> this notice-time))
|
||||
|
||||
+1
-7
@@ -483,13 +483,7 @@
|
||||
#f
|
||||
)
|
||||
((-> arg0 mode-name)
|
||||
(let ((s5-1 (-> arg0 mode-name value)))
|
||||
(set! (-> arg0 cam-mode) (the-as symbol (if (type? s5-1 state)
|
||||
s5-1
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
(set! (-> arg0 cam-mode) (the-as symbol (the-as object (as-type (-> arg0 mode-name value) state))))
|
||||
(set! (-> arg0 real-entity-name) #f)
|
||||
#f
|
||||
)
|
||||
|
||||
+1
-5
@@ -2619,11 +2619,7 @@
|
||||
)
|
||||
)
|
||||
((or (logtest? (-> self options) (cam-slave-options-u32 BUTT_CAM))
|
||||
(let ((s3-0 (handle->process (-> *camera* settings butt-handle))))
|
||||
(if (type? s3-0 process-drawable)
|
||||
s3-0
|
||||
)
|
||||
)
|
||||
(the-as object (as-type (handle->process (-> *camera* settings butt-handle)) process-drawable))
|
||||
)
|
||||
(vector-normalize-copy! gp-3 (-> self view-flat) 1.0)
|
||||
(let ((v1-283 (handle->process (-> *camera* settings butt-handle))))
|
||||
|
||||
+1
-6
@@ -789,12 +789,7 @@
|
||||
(set! (-> this surf) *gravel-surface*)
|
||||
)
|
||||
(((pat-event rail))
|
||||
(let* ((s4-0 (-> this process))
|
||||
(a0-14 (if (type? s4-0 process-focusable)
|
||||
s4-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((a0-14 (the-as process-drawable (as-type (-> this process) process-focusable))))
|
||||
(if (and a0-14 (not (logtest? (focus-status rail) (-> (the-as process-focusable a0-14) focus-status))))
|
||||
(set! (-> this surf) *rail-surface*)
|
||||
)
|
||||
|
||||
+6
-24
@@ -207,20 +207,11 @@
|
||||
(when (and (logtest? (process-mask crate enemy collectable guard) (-> arg0 mask))
|
||||
(not (logtest? (process-mask no-track) (-> arg0 mask)))
|
||||
)
|
||||
(let* ((gp-0 *search-info*)
|
||||
(s4-0 arg0)
|
||||
(s5-0 (if (type? s4-0 process-drawable)
|
||||
s4-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((gp-0 *search-info*)
|
||||
(s5-0 (as-type arg0 process-drawable))
|
||||
)
|
||||
(when s5-0
|
||||
(let* ((s4-1 (-> s5-0 root))
|
||||
(s3-0 (if (type? s4-1 collide-shape)
|
||||
s4-1
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((s3-0 (the-as trsqv (as-type (-> s5-0 root) collide-shape))))
|
||||
(when s3-0
|
||||
(let* ((s4-2 (the-as structure (-> (the-as collide-shape s3-0) root-prim prim-core)))
|
||||
(f30-0 (- (vector-vector-distance (-> gp-0 point) (-> (the-as collide-prim-core s4-2) world-sphere))
|
||||
@@ -228,12 +219,7 @@
|
||||
)
|
||||
)
|
||||
)
|
||||
(let* ((s1-0 s5-0)
|
||||
(s2-0 (if (type? s1-0 process-focusable)
|
||||
s1-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((s2-0 (the-as process-drawable (as-type s5-0 process-focusable))))
|
||||
(if (and (type? s2-0 process-focusable)
|
||||
s2-0
|
||||
s2-0
|
||||
@@ -407,11 +393,7 @@
|
||||
(while (begin (label cfg-89) (nonzero? s4-0))
|
||||
(+! s4-0 -1)
|
||||
(let* ((s1-0 (-> arg0 s4-0))
|
||||
(s2-0 (-> s1-0 process))
|
||||
(s3-0 (if (type? s2-0 process-focusable)
|
||||
s2-0
|
||||
)
|
||||
)
|
||||
(s3-0 (the-as process-drawable (as-type (-> s1-0 process) process-focusable)))
|
||||
)
|
||||
(when (and (and s3-0 (not (logtest? (-> (the-as process-focusable s3-0) focus-status) (focus-status disable dead))))
|
||||
(and (logtest? (process-mask crate enemy collectable guard) (-> s3-0 mask))
|
||||
|
||||
+3
-13
@@ -12,21 +12,11 @@
|
||||
(-> this src-proc)
|
||||
(or process (-> this dst-proc))
|
||||
)
|
||||
(let* ((process-source (handle->process (-> this src-proc)))
|
||||
(process-focus (if (type? process-source process-focusable)
|
||||
(the-as process-focusable process-source)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((process-focus (as-type (handle->process (-> this src-proc)) process-focusable)))
|
||||
(when process-focus
|
||||
(when (not process)
|
||||
(let ((process-dest (handle->process (-> this dst-proc))))
|
||||
(set! process (if (type? process-dest process-focusable)
|
||||
(the-as process-focusable process-dest)
|
||||
)
|
||||
)
|
||||
(if (not process)
|
||||
(set! process (as-type (handle->process (-> this dst-proc)) process-focusable))
|
||||
)
|
||||
)
|
||||
(when process
|
||||
(let ((start-pos (new 'stack-no-clear 'vector)))
|
||||
(set! (-> start-pos quad) (-> (get-trans process-focus 3) quad))
|
||||
|
||||
+8
-33
@@ -224,12 +224,7 @@
|
||||
(set! (-> this root root-prim local-sphere w) (* 2.5 (-> this root root-prim local-sphere w)))
|
||||
)
|
||||
(when (and arg2 (nonzero? (-> this draw)))
|
||||
(let* ((s5-0 (-> arg2 process))
|
||||
(v1-56 (if (type? s5-0 process-drawable)
|
||||
s5-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-56 (the-as process (as-type (-> arg2 process) process-drawable))))
|
||||
(if v1-56
|
||||
(set! (-> this draw light-index) (-> (the-as process-drawable v1-56) draw light-index))
|
||||
)
|
||||
@@ -543,11 +538,9 @@
|
||||
(lambda ((arg0 part-tracker))
|
||||
(let ((v1-1 (handle->process (-> arg0 userdata))))
|
||||
(when (the-as process v1-1)
|
||||
(let* ((s5-0 (handle->process (-> (the-as collectable v1-1) pickup-handle)))
|
||||
(a0-9 (if (type? s5-0 process-focusable)
|
||||
s5-0
|
||||
)
|
||||
)
|
||||
(let* ((a0-9
|
||||
(the-as process (as-type (handle->process (-> (the-as collectable v1-1) pickup-handle)) process-focusable))
|
||||
)
|
||||
(a2-0 (if (not a0-9)
|
||||
(-> arg0 root trans)
|
||||
(get-trans (the-as process-focusable a0-9) 3)
|
||||
@@ -604,18 +597,9 @@
|
||||
|
||||
;; definition for function check-blue-suck
|
||||
(defbehavior check-blue-suck eco ((arg0 process-drawable))
|
||||
(let ((v1-0 (if (type? arg0 process-drawable)
|
||||
arg0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-0 (as-type arg0 process-drawable)))
|
||||
(when v1-0
|
||||
(let* ((gp-1 (-> v1-0 root))
|
||||
(v1-1 (if (type? gp-1 collide-shape)
|
||||
gp-1
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-1 (the-as trsqv (as-type (-> v1-0 root) collide-shape))))
|
||||
(when v1-1
|
||||
(let ((a0-5 (-> self root root-prim prim-core))
|
||||
(a1-2 (-> (the-as collide-shape v1-1) root-prim prim-core))
|
||||
@@ -633,18 +617,9 @@
|
||||
|
||||
;; definition for function add-blue-motion
|
||||
(defbehavior add-blue-motion eco ((arg0 symbol) (arg1 symbol) (arg2 symbol) (arg3 symbol))
|
||||
(let* ((gp-0 (handle->process (-> self target)))
|
||||
(s2-0 (if (type? gp-0 process-drawable)
|
||||
gp-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((s2-0 (the-as process (as-type (handle->process (-> self target)) process-drawable))))
|
||||
(when s2-0
|
||||
(let ((a0-6 (if (type? s2-0 process-focusable)
|
||||
(the-as process-focusable s2-0)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((a0-6 (as-type s2-0 process-focusable)))
|
||||
(when a0-6
|
||||
(let ((s2-1 (-> self root root-prim prim-core))
|
||||
(gp-1 (get-trans a0-6 3))
|
||||
|
||||
+1
-5
@@ -332,11 +332,7 @@
|
||||
(.mov a0-10 vf3)
|
||||
(let ((s4-0 (-> v1-23 process)))
|
||||
(b! (< f0-2 a0-10) cfg-27)
|
||||
(let ((a1-29 (if (type? s4-0 process-focusable)
|
||||
(the-as process-focusable s4-0)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((a1-29 (as-type s4-0 process-focusable)))
|
||||
(if a1-29
|
||||
(conveyor-method-26 this a1-29)
|
||||
)
|
||||
|
||||
+2
-12
@@ -810,19 +810,9 @@
|
||||
:code (behavior ((arg0 handle))
|
||||
(set! (-> self target) arg0)
|
||||
(until #f
|
||||
(let* ((gp-0 (handle->process (-> self target)))
|
||||
(v1-3 (if (type? gp-0 process-drawable)
|
||||
gp-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-3 (the-as process (as-type (handle->process (-> self target)) process-drawable))))
|
||||
(when v1-3
|
||||
(let* ((gp-1 (-> (the-as process-drawable v1-3) root))
|
||||
(v1-4 (if (type? (the-as collide-shape-moving gp-1) collide-shape)
|
||||
gp-1
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-4 (the-as trsqv (as-type (-> (the-as process-drawable v1-3) root) collide-shape))))
|
||||
(when v1-4
|
||||
(let* ((gp-2 (-> (the-as collide-shape-moving (-> self root)) root-prim prim-core))
|
||||
(a1-3 (-> (the-as collide-shape-moving v1-4) root-prim prim-core))
|
||||
|
||||
+4
-24
@@ -310,12 +310,7 @@
|
||||
(set! (-> self move-pos 0) (-> self move-pos 1))
|
||||
(cond
|
||||
((not (logtest? (-> event param 0) 7))
|
||||
(let ((gp-0 (the-as number (-> event param 0))))
|
||||
(set! (-> self move-pos 1) (if (type? (the-as uint gp-0) float)
|
||||
(the-as float gp-0)
|
||||
)
|
||||
)
|
||||
)
|
||||
(set! (-> self move-pos 1) (as-type (-> event param 0) float))
|
||||
)
|
||||
(else
|
||||
(case (-> event param 0)
|
||||
@@ -334,12 +329,7 @@
|
||||
(('jump-to)
|
||||
(cond
|
||||
((not (logtest? (-> event param 0) 7))
|
||||
(let ((gp-1 (the-as number (-> event param 0))))
|
||||
(set! (-> self move-pos 1) (if (type? (the-as uint gp-1) float)
|
||||
(the-as float gp-1)
|
||||
)
|
||||
)
|
||||
)
|
||||
(set! (-> self move-pos 1) (as-type (-> event param 0) float))
|
||||
)
|
||||
(else
|
||||
(case (-> event param 0)
|
||||
@@ -465,12 +455,7 @@
|
||||
;; definition for method 44 of type elevator
|
||||
;; WARN: Return type mismatch object vs symbol.
|
||||
(defmethod elevator-method-44 ((this elevator))
|
||||
(let* ((target-temp *target*)
|
||||
(target (if (type? target-temp process-focusable)
|
||||
target-temp
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((target (the-as target (as-type *target* process-focusable))))
|
||||
(the-as
|
||||
symbol
|
||||
(and target (move-between-points this (get-trans target 0) (-> this move-pos 0) (-> this move-pos 1)))
|
||||
@@ -877,12 +862,7 @@
|
||||
)
|
||||
(set! sv-32 (the-as float 0.0))
|
||||
(set! sv-36 (-> this path))
|
||||
(let ((s5-2 *target*))
|
||||
(set! sv-40 (if (type? s5-2 process-focusable)
|
||||
s5-2
|
||||
)
|
||||
)
|
||||
)
|
||||
(set! sv-40 (the-as target (as-type *target* process-focusable)))
|
||||
(if (not (and sv-40
|
||||
(logtest? (-> this params flags) (elevator-flags elevator-flags-4))
|
||||
(find-closest-point-in-path! this (get-trans sv-40 0) (& sv-32) #f #t)
|
||||
|
||||
+22
-125
@@ -63,12 +63,7 @@
|
||||
)
|
||||
)
|
||||
(when arg1
|
||||
(let* ((s5-1 (-> self root))
|
||||
(a0-7 (if (type? s5-1 collide-shape)
|
||||
(the-as collide-shape s5-1)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((a0-7 (as-type (-> self root) collide-shape)))
|
||||
(if a0-7
|
||||
(move-to-point! a0-7 (-> (the-as process-drawable gp-0) root trans))
|
||||
(set! (-> self root trans quad) (-> (the-as process-drawable gp-0) root trans quad))
|
||||
@@ -83,12 +78,7 @@
|
||||
(if (or (zero? (-> self skel active-channels)) (not (-> self skel root-channel 0 frame-group)))
|
||||
(logior! (-> self draw status) (draw-control-status no-draw-temp))
|
||||
)
|
||||
(let* ((gp-1 self)
|
||||
(v1-38 (if (type? gp-1 manipy)
|
||||
gp-1
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-38 (the-as process-drawable (as-type self manipy))))
|
||||
(if (and v1-38 (not (-> (the-as manipy v1-38) draw?)))
|
||||
(logior! (-> self draw status) (draw-control-status no-draw-temp))
|
||||
)
|
||||
@@ -216,12 +206,7 @@
|
||||
:code (behavior ((arg0 handle))
|
||||
(move-along-path self)
|
||||
(suspend)
|
||||
(while (let* ((s5-0 (handle->process arg0))
|
||||
(a0-7 (if (type? s5-0 process-focusable)
|
||||
s5-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(while (let ((a0-7 (the-as process (as-type (handle->process arg0) process-focusable))))
|
||||
(and a0-7 (focus-test? (the-as process-focusable a0-7) pole))
|
||||
)
|
||||
(move-along-path self)
|
||||
@@ -1314,25 +1299,8 @@
|
||||
;; definition for method 15 of type part-tracker
|
||||
;; WARN: Return type mismatch object vs none.
|
||||
(defmethod notify-parent-of-death ((this part-tracker))
|
||||
(with-pp
|
||||
(let ((gp-0 (new 'stack-no-clear 'event-message-block)))
|
||||
(set! (-> gp-0 from) (process->ppointer pp))
|
||||
(set! (-> gp-0 num-params) 1)
|
||||
(set! (-> gp-0 message) 'notify)
|
||||
(set! (-> gp-0 param 0) (the-as uint 'die))
|
||||
(let ((s5-0 send-event-function)
|
||||
(s4-0 (ppointer->process (-> this parent)))
|
||||
)
|
||||
(s5-0
|
||||
(if (type? s4-0 process)
|
||||
s4-0
|
||||
)
|
||||
gp-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(none)
|
||||
)
|
||||
(send-event (the-as process-tree (as-type (ppointer->process (-> this parent)) process)) 'notify 'die)
|
||||
(none)
|
||||
)
|
||||
|
||||
;; failed to figure out what this is:
|
||||
@@ -1353,12 +1321,7 @@
|
||||
(if (-> self callback)
|
||||
((-> self callback) self)
|
||||
)
|
||||
(let* ((gp-0 (handle->process (-> self target)))
|
||||
(v1-8 (if (type? gp-0 process-drawable)
|
||||
gp-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-8 (the-as process (as-type (handle->process (-> self target)) process-drawable))))
|
||||
(cond
|
||||
((and v1-8
|
||||
(nonzero? (-> (the-as process-drawable v1-8) root))
|
||||
@@ -1381,12 +1344,7 @@
|
||||
(if (-> self linger-callback)
|
||||
((-> self linger-callback) self)
|
||||
)
|
||||
(let* ((s5-0 (handle->process (-> self target)))
|
||||
(v1-30 (if (type? s5-0 process-drawable)
|
||||
s5-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-30 (the-as process (as-type (handle->process (-> self target)) process-drawable))))
|
||||
(if (and v1-30
|
||||
(nonzero? (-> (the-as process-drawable v1-30) root))
|
||||
(nonzero? (-> (the-as process-drawable v1-30) node-list))
|
||||
@@ -1536,25 +1494,8 @@
|
||||
;; definition for method 15 of type lightning-tracker
|
||||
;; WARN: Return type mismatch object vs none.
|
||||
(defmethod notify-parent-of-death ((this lightning-tracker))
|
||||
(with-pp
|
||||
(let ((gp-0 (new 'stack-no-clear 'event-message-block)))
|
||||
(set! (-> gp-0 from) (process->ppointer pp))
|
||||
(set! (-> gp-0 num-params) 1)
|
||||
(set! (-> gp-0 message) 'notify)
|
||||
(set! (-> gp-0 param 0) (the-as uint 'die))
|
||||
(let ((s5-0 send-event-function)
|
||||
(s4-0 (ppointer->process (-> this parent)))
|
||||
)
|
||||
(s5-0
|
||||
(if (type? s4-0 process)
|
||||
s4-0
|
||||
)
|
||||
gp-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(none)
|
||||
)
|
||||
(send-event (the-as process-tree (as-type (ppointer->process (-> this parent)) process)) 'notify 'die)
|
||||
(none)
|
||||
)
|
||||
|
||||
;; definition for method 16 of type lightning-tracker
|
||||
@@ -1564,18 +1505,10 @@
|
||||
(if (-> this callback)
|
||||
((-> this callback) this)
|
||||
)
|
||||
(let ((a0-6 (cond
|
||||
((>= (-> this target-joint0) 0)
|
||||
(let ((s5-0 (handle->process (-> this target0))))
|
||||
(if (type? s5-0 process-drawable)
|
||||
s5-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(else
|
||||
(let ((a0-6 (if (>= (-> this target-joint0) 0)
|
||||
(the-as process (as-type (handle->process (-> this target0)) process-drawable))
|
||||
(the-as process #f)
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
(cond
|
||||
@@ -1611,18 +1544,10 @@
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((a0-22 (cond
|
||||
((>= (-> this target-joint1) 0)
|
||||
(let ((s5-3 (handle->process (-> this target1))))
|
||||
(if (type? s5-3 process-drawable)
|
||||
s5-3
|
||||
)
|
||||
)
|
||||
)
|
||||
(else
|
||||
(let ((a0-22 (if (>= (-> this target-joint1) 0)
|
||||
(the-as process (as-type (handle->process (-> this target1)) process-drawable))
|
||||
(the-as process #f)
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
(cond
|
||||
@@ -1706,12 +1631,7 @@
|
||||
(let ((s5-1 (new 'stack-no-clear 'vector)))
|
||||
(set! (-> s5-1 quad) (-> self offset1 quad))
|
||||
(when (and (>= (-> self target-joint1) 0) (< (-> self target-joint1) 256))
|
||||
(let* ((s4-0 (handle->process (-> self target1)))
|
||||
(v1-28 (if (type? s4-0 process-drawable)
|
||||
s4-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-28 (the-as process (as-type (handle->process (-> self target1)) process-drawable))))
|
||||
(if (and v1-28 (nonzero? (-> (the-as process-drawable v1-28) root)))
|
||||
(set! (-> s5-1 quad) (-> (vector<-cspace!
|
||||
(new 'stack-no-clear 'vector)
|
||||
@@ -1808,14 +1728,11 @@
|
||||
(defbehavior lightning-tracker-init lightning-tracker ((arg0 lightning-spec) (arg1 time-frame) (arg2 symbol) (arg3 process-drawable) (arg4 vector) (arg5 vector))
|
||||
(stack-size-set! (-> self main-thread) 128)
|
||||
(set! (-> self target0) (process->handle arg3))
|
||||
(let ((s1-1 (ppointer->process (-> self parent))))
|
||||
(set! (-> self target1) (process->handle (the-as process (if (type? s1-1 process-drawable)
|
||||
s1-1
|
||||
)
|
||||
)
|
||||
)
|
||||
(set! (-> self target1)
|
||||
(process->handle
|
||||
(the-as process (the-as process-tree (as-type (ppointer->process (-> self parent)) process-drawable)))
|
||||
)
|
||||
)
|
||||
)
|
||||
(cond
|
||||
((>= 256 (the-as int arg4))
|
||||
(set! (-> self target-joint0) (the-as int arg4))
|
||||
@@ -1904,12 +1821,7 @@
|
||||
;; definition for function process-release?
|
||||
;; WARN: Return type mismatch object vs symbol.
|
||||
(defbehavior process-release? process ((arg0 process))
|
||||
(let* ((gp-0 (command-get-process arg0 *target*))
|
||||
(a0-2 (if (type? gp-0 process-focusable)
|
||||
(the-as process-focusable gp-0)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((a0-2 (as-type (command-get-process arg0 *target*) process-focusable)))
|
||||
(the-as symbol (if (and a0-2 (focus-test? a0-2 grabbed))
|
||||
(send-event a0-2 'end-mode)
|
||||
#t
|
||||
@@ -2980,19 +2892,9 @@
|
||||
:code (behavior ()
|
||||
(set-time! (-> self state-time))
|
||||
(while ((-> self run-function))
|
||||
(let* ((gp-0 (handle->process (-> self target)))
|
||||
(a0-4 (if (type? gp-0 process-drawable)
|
||||
gp-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((a0-4 (the-as process (as-type (handle->process (-> self target)) process-drawable))))
|
||||
(when a0-4
|
||||
(let* ((gp-1 (-> (the-as process-drawable a0-4) root))
|
||||
(a0-6 (if (type? gp-1 collide-shape)
|
||||
gp-1
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((a0-6 (the-as trsqv (as-type (-> (the-as process-drawable a0-4) root) collide-shape))))
|
||||
(if a0-6
|
||||
(set! (-> self root trans quad) (-> (the-as collide-shape a0-6) root-prim prim-core world-sphere quad))
|
||||
)
|
||||
@@ -3163,12 +3065,7 @@
|
||||
:event (behavior ((proc process) (argc int) (message symbol) (block event-message-block))
|
||||
(case message
|
||||
(('touched)
|
||||
(let* ((s4-0 proc)
|
||||
(v1-1 (if (type? s4-0 process-drawable)
|
||||
s4-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-1 (the-as process (as-type proc process-drawable))))
|
||||
(when v1-1
|
||||
(let ((a0-3 (-> (the-as process-drawable v1-1) root))
|
||||
(a1-2 (new 'stack-no-clear 'collide-query))
|
||||
|
||||
+2
-10
@@ -277,12 +277,7 @@
|
||||
:event (behavior ((proc process) (argc int) (message symbol) (block event-message-block))
|
||||
(case message
|
||||
(('touch 'attack 'bonk)
|
||||
(let* ((proc-temp proc)
|
||||
(proc-focus (if (type? proc-temp process-focusable)
|
||||
(the-as process-focusable proc-temp)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((proc-focus (as-type proc process-focusable)))
|
||||
(cond
|
||||
((and proc-focus (focus-test? proc-focus edge-grab))
|
||||
(set! (-> self safe-time) (+ (current-time) (seconds 0.2)))
|
||||
@@ -293,10 +288,7 @@
|
||||
)
|
||||
)
|
||||
(set! (-> self hit-point quad) (-> self root trans quad))
|
||||
(set! proc-focus (if (type? proc process-focusable)
|
||||
(the-as process-focusable proc)
|
||||
)
|
||||
)
|
||||
(set! proc-focus (as-type proc process-focusable))
|
||||
(set! (-> self hit-point quad) (-> (get-trans proc-focus 0) quad))
|
||||
)
|
||||
(if (zero? (-> self bounce-time))
|
||||
|
||||
+2
-12
@@ -340,12 +340,7 @@
|
||||
(('ridden)
|
||||
(let ((v1-7 (the-as object (-> arg3 param 0))))
|
||||
(when (the-as uint v1-7)
|
||||
(let* ((s5-1 (handle->process (-> (the-as collide-rider v1-7) rider-handle)))
|
||||
(v1-11 (if (type? s5-1 process-focusable)
|
||||
(the-as process-focusable s5-1)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-11 (as-type (handle->process (-> (the-as collide-rider v1-7) rider-handle)) process-focusable)))
|
||||
(when (and v1-11
|
||||
(logtest? (-> v1-11 mask) (process-mask target))
|
||||
(not (logtest? (-> v1-11 focus-status) (focus-status on-water under-water)))
|
||||
@@ -376,12 +371,7 @@
|
||||
(the-as time-frame (-> this info player-force-timeout))
|
||||
)
|
||||
(set! (-> this player-bonk-timeout) (the-as uint (current-time)))
|
||||
(let* ((s4-0 arg0)
|
||||
(v1-31 (if (type? s4-0 process-drawable)
|
||||
s4-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-31 (as-type arg0 process-drawable)))
|
||||
(when v1-31
|
||||
(logior! (-> this flags) (rigid-body-object-flag player-impulse-force))
|
||||
(set! (-> this player-force-position quad) (-> v1-31 root trans quad))
|
||||
|
||||
+3
-16
@@ -260,12 +260,7 @@
|
||||
)
|
||||
:enter (behavior ()
|
||||
(set! (-> self start-time) (-> *display* game-clock frame-counter))
|
||||
(let* ((gp-0 (ppointer->process (-> self parent 0 parent)))
|
||||
(a1-1 (if (type? gp-0 process-focusable)
|
||||
gp-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((a1-1 (the-as process-tree (as-type (ppointer->process (-> self parent 0 parent)) process-focusable))))
|
||||
(if a1-1
|
||||
(try-update-focus (-> self focus) (the-as process-focusable a1-1))
|
||||
)
|
||||
@@ -280,12 +275,7 @@
|
||||
)
|
||||
)
|
||||
:code (behavior ()
|
||||
(let* ((gp-0 (ppointer->process (-> self parent 0 parent)))
|
||||
(a0-1 (if (type? gp-0 process-focusable)
|
||||
(the-as process-focusable gp-0)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((a0-1 (as-type (ppointer->process (-> self parent 0 parent)) process-focusable)))
|
||||
(if (and a0-1 (focus-test? a0-1 pilot))
|
||||
(send-event
|
||||
(ppointer->process (-> self parent))
|
||||
@@ -522,10 +512,7 @@
|
||||
)
|
||||
(('touch 'attack)
|
||||
(let ((s4-0 (process-spawn camera-remote :init cam-slave-init cam-remote #f :from *camera-dead-pool* :to proc))
|
||||
(s5-2 (if (type? proc process-focusable)
|
||||
(the-as process-focusable proc)
|
||||
)
|
||||
)
|
||||
(s5-2 (as-type proc process-focusable))
|
||||
)
|
||||
(when (and s4-0 (begin (send-event s5-2 'change-mode 'board #f) (focus-test? s5-2 board)))
|
||||
(change-parent self (ppointer->process s4-0))
|
||||
|
||||
+3
-7
@@ -395,13 +395,9 @@
|
||||
v0-1
|
||||
)
|
||||
(('water)
|
||||
(let* ((s5-0 (the-as object (-> arg3 param 0)))
|
||||
(s4-0 (the-as object (-> arg3 param 1)))
|
||||
(gp-0 (if (type? (the-as process s4-0) process-focusable)
|
||||
(the-as uint s4-0)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((s5-0 (the-as object (-> arg3 param 0)))
|
||||
(gp-0 (the-as object (as-type (-> arg3 param 1) process-focusable)))
|
||||
)
|
||||
(when (and (logtest? (-> self flags) (water-flags deadly))
|
||||
(logtest? (water-flags touch-water) (-> (the-as water-info s5-0) flags))
|
||||
(the-as uint gp-0)
|
||||
|
||||
+1
-5
@@ -334,11 +334,7 @@
|
||||
(.mov a0-10 vf3)
|
||||
(let ((s4-0 (-> v1-23 process)))
|
||||
(b! (< f0-2 a0-10) cfg-27)
|
||||
(let ((a1-29 (if (type? s4-0 process-focusable)
|
||||
s4-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((a1-29 (the-as process-drawable (as-type s4-0 process-focusable))))
|
||||
(if a1-29
|
||||
(push-process this (the-as process-focusable a1-29))
|
||||
)
|
||||
|
||||
+12
-21
@@ -933,11 +933,7 @@
|
||||
)
|
||||
)
|
||||
)
|
||||
(let* ((s3-2 (-> this process control))
|
||||
(v1-236 (if (type? s3-2 control-info)
|
||||
s3-2
|
||||
)
|
||||
)
|
||||
(let* ((v1-236 (as-type (-> this process control) control-info))
|
||||
(v1-237 (and v1-236 (not (time-elapsed? (-> v1-236 last-time-on-surface) (seconds 0.5)))))
|
||||
)
|
||||
(if (and (logtest? (-> this flags) (water-flags swim-ground))
|
||||
@@ -1456,16 +1452,16 @@
|
||||
)
|
||||
)
|
||||
(('water-anim)
|
||||
(let* ((s0-0 (command-get-process
|
||||
(-> (the-as pair (-> (the-as pair (-> (the-as pair s2-0) cdr)) cdr)) car)
|
||||
(the-as process #f)
|
||||
)
|
||||
)
|
||||
(s1-0 (if (type? s0-0 process-drawable)
|
||||
s0-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((s1-0 (the-as process (as-type
|
||||
(command-get-process
|
||||
(-> (the-as pair (-> (the-as pair (-> (the-as pair s2-0) cdr)) cdr)) car)
|
||||
(the-as process #f)
|
||||
)
|
||||
process-drawable
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
(cond
|
||||
(s1-0
|
||||
(set! (-> arg0 flags) (water-flags active use-water-anim))
|
||||
@@ -1506,12 +1502,7 @@
|
||||
(logior! (-> arg0 flags) (water-flags lava))
|
||||
)
|
||||
((= v1-39 'mech)
|
||||
(let* ((s1-1 (-> arg2 process))
|
||||
(a0-39 (if (type? s1-1 process-focusable)
|
||||
s1-1
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((a0-39 (the-as process-drawable (as-type (-> arg2 process) process-focusable))))
|
||||
(when (and a0-39 (not (logtest? (focus-status mech) (-> (the-as process-focusable a0-39) focus-status))))
|
||||
(set! (-> arg0 flags) (water-flags))
|
||||
0
|
||||
|
||||
+10
-42
@@ -498,13 +498,9 @@
|
||||
(sound-play-by-spec (static-sound-spec "beep" :fo-curve 1) (new-sound-id) (the-as vector #t))
|
||||
(cond
|
||||
((-> arg0 target)
|
||||
(let ((s5-11 (-> arg0 target)))
|
||||
(set! (-> arg0 edit-plane) (the-as editable-plane (if (type? s5-11 editable-plane)
|
||||
s5-11
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
(set! (-> arg0 edit-plane)
|
||||
(the-as editable-plane (the-as editable (as-type (-> arg0 target) editable-plane)))
|
||||
)
|
||||
(editable-array-method-16 arg0)
|
||||
)
|
||||
(else
|
||||
@@ -1709,11 +1705,7 @@
|
||||
)
|
||||
(while (< s4-2 s5-2)
|
||||
(when (and s3-0 (logtest? (-> s3-0 flags) (editable-flag selected)))
|
||||
(let ((v1-60 (if (type? s3-0 editable)
|
||||
s3-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-60 (as-type s3-0 editable)))
|
||||
(when v1-60
|
||||
(set! (-> v1-60 name) (the-as string (-> block param 0)))
|
||||
(logior! (-> v1-60 flags) (editable-flag changed))
|
||||
@@ -1740,11 +1732,7 @@
|
||||
)
|
||||
(while (< s4-3 s5-3)
|
||||
(when (and s3-1 (logtest? (-> s3-1 flags) (editable-flag selected)))
|
||||
(let ((v1-73 (if (type? s3-1 editable)
|
||||
s3-1
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-73 (as-type s3-1 editable)))
|
||||
(when (and v1-73 (-> v1-73 region))
|
||||
(set! (-> v1-73 region level) (the-as string (-> gp-3 dbname)))
|
||||
(set! (-> v1-73 region changed) #t)
|
||||
@@ -1777,11 +1765,7 @@
|
||||
)
|
||||
(while (< s5-4 gp-4)
|
||||
(when (and s4-4 (logtest? (-> s4-4 flags) (editable-flag selected)))
|
||||
(let ((s3-2 (if (type? s4-4 editable-light)
|
||||
(the-as editable-light s4-4)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((s3-2 (as-type s4-4 editable-light)))
|
||||
(when s3-2
|
||||
(set-vector! (-> s3-2 direction) f30-0 f28-0 f26-0 f24-0)
|
||||
(vector-normalize! (-> s3-2 direction) 1.0)
|
||||
@@ -1811,11 +1795,7 @@
|
||||
)
|
||||
(while (< s5-5 gp-5)
|
||||
(when (and s4-5 (logtest? (-> s4-5 flags) (editable-flag selected)))
|
||||
(let ((v1-114 (if (type? s4-5 editable-light)
|
||||
(the-as editable-light s4-5)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-114 (as-type s4-5 editable-light)))
|
||||
(when v1-114
|
||||
(set-vector! (-> v1-114 color) f30-1 f28-1 f26-1 f24-1)
|
||||
(logior! (-> v1-114 flags) (editable-flag changed))
|
||||
@@ -1844,11 +1824,7 @@
|
||||
)
|
||||
(while (< s4-6 gp-6)
|
||||
(when (and s3-3 (logtest? (-> s3-3 flags) (editable-flag selected)))
|
||||
(let ((v1-129 (if (type? s3-3 editable-light)
|
||||
s3-3
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-129 (the-as editable (as-type s3-3 editable-light))))
|
||||
(when v1-129
|
||||
(set! (-> (the-as editable-light (+ (* s5-6 4) (the-as uint v1-129))) decay-start) f30-2)
|
||||
(logior! (-> v1-129 flags) (editable-flag changed))
|
||||
@@ -2253,11 +2229,7 @@
|
||||
)
|
||||
(while (< s3-0 s4-0)
|
||||
(when (and s2-0 (logtest? (-> s2-0 flags) (editable-flag selected)))
|
||||
(let ((a0-7 (if (type? s2-0 editable-light)
|
||||
s2-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((a0-7 (the-as object (as-type s2-0 editable-light))))
|
||||
(when (the-as editable a0-7)
|
||||
(set! (-> (&+ (the-as (pointer float) a0-7) (/ arg0 8)) 0) arg2)
|
||||
(logior! (-> (the-as editable a0-7) flags) (editable-flag changed))
|
||||
@@ -2284,11 +2256,7 @@
|
||||
)
|
||||
(while (< s4-1 s5-1)
|
||||
(when (and s3-1 (logtest? (-> s3-1 flags) (editable-flag selected)))
|
||||
(let ((v1-29 (if (type? s3-1 editable-light)
|
||||
s3-1
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-29 (the-as object (as-type s3-1 editable-light))))
|
||||
(if (the-as editable v1-29)
|
||||
(set! f30-0 (-> (&+ (the-as (pointer float) v1-29) (/ arg0 8)) 0))
|
||||
)
|
||||
|
||||
+2
-14
@@ -1027,13 +1027,7 @@
|
||||
(draw-string "..." s1-0 s5-0)
|
||||
(set! arg4 (and (zero? arg3) arg4))
|
||||
(when arg4
|
||||
(let ((v1-14 s5-0)
|
||||
(a1-5 20)
|
||||
(a0-8 379)
|
||||
)
|
||||
(set! (-> v1-14 origin x) (the float a1-5))
|
||||
(set! (-> v1-14 origin y) (the float a0-8))
|
||||
)
|
||||
(set-origin! s5-0 20 379)
|
||||
(draw-string-adv (-> arg0 name) s1-0 s5-0)
|
||||
(draw-string-adv ":" s1-0 s5-0)
|
||||
(draw-string (-> arg0 display-str) s1-0 s5-0)
|
||||
@@ -1113,13 +1107,7 @@
|
||||
(font-color menu)
|
||||
)
|
||||
)
|
||||
(let ((v1-20 (-> arg0 context font))
|
||||
(a1-5 s3-1)
|
||||
(a0-15 s2-1)
|
||||
)
|
||||
(set! (-> v1-20 origin x) (the float a1-5))
|
||||
(set! (-> v1-20 origin y) (the float a0-15))
|
||||
)
|
||||
(set-origin! (-> arg0 context font) s3-1 s2-1)
|
||||
(set! sv-16 (-> *display* frames (-> *display* on-screen) debug-buf))
|
||||
(set! sv-32 (-> sv-16 base))
|
||||
(draw-string ">" sv-16 (-> arg0 context font))
|
||||
|
||||
+2
-10
@@ -257,12 +257,7 @@
|
||||
(dotimes (s2-0 (-> s3-0 length))
|
||||
(let ((s1-0 (-> s3-0 s2-0)))
|
||||
(-> s1-0 aid)
|
||||
(let* ((s0-0 s1-0)
|
||||
(v1-14 (if (type? s0-0 entity-nav-mesh)
|
||||
s0-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-14 (as-type s1-0 entity-nav-mesh)))
|
||||
(when v1-14
|
||||
(let ((a0-7 (-> v1-14 nav-mesh))
|
||||
(a1-2 (new 'stack-no-clear 'nav-find-poly-parms))
|
||||
@@ -753,10 +748,7 @@
|
||||
(dotimes (s2-1 (-> s3-3 length))
|
||||
(let* ((s0-1 (-> s3-3 s2-1))
|
||||
(s1-1 (-> s0-1 aid))
|
||||
(v1-28 (if (type? s0-1 entity-nav-mesh)
|
||||
s0-1
|
||||
)
|
||||
)
|
||||
(v1-28 (as-type s0-1 entity-nav-mesh))
|
||||
)
|
||||
(when v1-28
|
||||
(let ((a0-24 (-> v1-28 nav-mesh))
|
||||
|
||||
+1
-6
@@ -773,12 +773,7 @@
|
||||
;; definition (debug) for function teleport-camera-by-name
|
||||
;; WARN: Return type mismatch object vs none.
|
||||
(defun-debug teleport-camera-by-name ((arg0 string))
|
||||
(let* ((gp-0 (entity-by-name arg0))
|
||||
(v1-0 (if (type? gp-0 entity-actor)
|
||||
gp-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-0 (the-as entity (as-type (entity-by-name arg0) entity-actor))))
|
||||
(if (and v1-0 *camera*)
|
||||
(send-event *camera* 'teleport-to-vector-start-string (-> v1-0 trans))
|
||||
)
|
||||
|
||||
+15
-47
@@ -322,12 +322,12 @@
|
||||
(gp-0 (the-as nav-mesh #f))
|
||||
)
|
||||
(when v1-1
|
||||
(let* ((s5-1 (entity-nav-mesh-by-aid (the-as actor-id (-> (the-as (pointer uint32) (&+ v1-1 (* arg2 4)))))))
|
||||
(v1-3 (if (type? s5-1 entity-nav-mesh)
|
||||
s5-1
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-3 (as-type
|
||||
(entity-nav-mesh-by-aid (the-as actor-id (-> (the-as (pointer uint32) (&+ v1-1 (* arg2 4))))))
|
||||
entity-nav-mesh
|
||||
)
|
||||
)
|
||||
)
|
||||
(if v1-3
|
||||
(set! gp-0 (-> v1-3 nav-mesh))
|
||||
)
|
||||
@@ -454,12 +454,7 @@
|
||||
;; definition (debug) for function process-status-bits
|
||||
;; WARN: Return type mismatch int vs none.
|
||||
(defun-debug process-status-bits ((arg0 process) (arg1 symbol))
|
||||
(let* ((s5-0 arg0)
|
||||
(s3-0 (if (type? s5-0 process-drawable)
|
||||
s5-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((s3-0 (the-as process (as-type arg0 process-drawable))))
|
||||
(if (and s3-0 (zero? (-> (the-as process-drawable s3-0) draw)))
|
||||
(set! s3-0 (the-as process #f))
|
||||
)
|
||||
@@ -689,12 +684,7 @@
|
||||
(format #t " :trans ~14m ~14m ~14m " (-> this extra trans x) (-> this extra trans y) (-> this extra trans z))
|
||||
(format #t " :trans ~14f ~14f ~14f " (-> this extra trans x) (-> this extra trans y) (-> this extra trans z))
|
||||
)
|
||||
(let* ((s3-2 (-> this extra process))
|
||||
(s4-2 (if (type? s3-2 process-drawable)
|
||||
s3-2
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((s4-2 (the-as process (as-type (-> this extra process) process-drawable))))
|
||||
(format
|
||||
#t
|
||||
":pr #x~8X ~-12S ~-21S ~-5S/~-5S "
|
||||
@@ -898,28 +888,16 @@
|
||||
(set! sv-16 (res-lump-data s2-0 'visvol pointer))
|
||||
(set! sv-20 (&+ sv-16 0))
|
||||
(set! sv-24 (&+ sv-16 16))
|
||||
(let ((s2-1 (-> s2-0 extra process)))
|
||||
(set! sv-28 (if (type? s2-1 process-drawable)
|
||||
s2-1
|
||||
)
|
||||
)
|
||||
)
|
||||
(set! sv-28 (the-as process (as-type (-> s2-0 extra process) process-drawable)))
|
||||
)
|
||||
(when sv-28
|
||||
(update-actor-vis-box (the-as process-drawable sv-28) (the-as vector sv-20) (the-as vector sv-24))
|
||||
(let ((s2-2 (-> sv-28 child)))
|
||||
(while s2-2
|
||||
(let ((s1-0 update-actor-vis-box)
|
||||
(s0-0 (-> s2-2 0))
|
||||
)
|
||||
(s1-0
|
||||
(the-as process-drawable (if (type? s0-0 process-drawable)
|
||||
s0-0
|
||||
)
|
||||
)
|
||||
(the-as vector sv-20)
|
||||
(the-as vector sv-24)
|
||||
)
|
||||
(update-actor-vis-box
|
||||
(the-as process-drawable (the-as process-tree (as-type (-> s2-2 0) process-drawable)))
|
||||
(the-as vector sv-20)
|
||||
(the-as vector sv-24)
|
||||
)
|
||||
(set! s2-2 (-> s2-2 0 brother))
|
||||
)
|
||||
@@ -1539,12 +1517,7 @@
|
||||
)
|
||||
(cond
|
||||
(*debug-actor*
|
||||
(let* ((s4-3 *debug-actor*)
|
||||
(s5-4 (if (type? s4-3 process-drawable)
|
||||
s4-3
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((s5-4 (the-as object (as-type *debug-actor* process-drawable))))
|
||||
(when s5-4
|
||||
(if (nonzero? (-> (the-as process-drawable s5-4) skel))
|
||||
(debug-print-channels (-> (the-as process-drawable s5-4) skel) (the-as symbol *stdcon*))
|
||||
@@ -1993,12 +1966,7 @@
|
||||
)
|
||||
)
|
||||
(else
|
||||
(let* ((s3-0 arg0)
|
||||
(v1-44 (if (type? s3-0 process-drawable)
|
||||
s3-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-44 (the-as process (as-type arg0 process-drawable))))
|
||||
(when v1-44
|
||||
(cond
|
||||
((and (nonzero? (-> (the-as process-drawable v1-44) part))
|
||||
|
||||
+3
-17
@@ -97,12 +97,7 @@
|
||||
((25)
|
||||
(logior! (-> arg0 mask) (sound-mask reg0))
|
||||
(set! (-> arg0 reg 0) (the-as uint (-> *footstep-surface* material)))
|
||||
(let* ((s2-3 arg3)
|
||||
(v1-33 (if (type? s2-3 process-focusable)
|
||||
s2-3
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-33 (as-type arg3 process-focusable)))
|
||||
(when v1-33
|
||||
(cond
|
||||
((focus-test? v1-33 in-air)
|
||||
@@ -112,12 +107,7 @@
|
||||
(set! (-> arg0 reg 0) (the-as uint 127))
|
||||
)
|
||||
(else
|
||||
(let* ((s2-4 (-> v1-33 root))
|
||||
(v1-34 (if (type? s2-4 collide-shape-moving)
|
||||
s2-4
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-34 (the-as collide-shape (as-type (-> v1-33 root) collide-shape-moving))))
|
||||
(if v1-34
|
||||
(set! (-> arg0 reg 0) (the-as uint (-> (the-as collide-shape-moving v1-34) ground-pat material)))
|
||||
)
|
||||
@@ -362,11 +352,7 @@
|
||||
(= (-> v1-23 data 5) 116)
|
||||
(= (-> v1-23 data 6) 45)
|
||||
)
|
||||
(let* ((s3-1 (-> this process root))
|
||||
(v1-27 (if (type? s3-1 collide-shape-moving)
|
||||
s3-1
|
||||
)
|
||||
)
|
||||
(let* ((v1-27 (the-as trsqv (as-type (-> this process root) collide-shape-moving)))
|
||||
(t1-2 (if v1-27
|
||||
(-> (the-as collide-shape-moving v1-27) ground-pat)
|
||||
*footstep-surface*
|
||||
|
||||
+7
-21
@@ -1878,12 +1878,8 @@
|
||||
(new 'stack 'font-context *font-default-matrix* 32 320 0.0 (font-color default) (font-flags shadow kerning))
|
||||
)
|
||||
)
|
||||
(let ((v1-5 gp-0))
|
||||
(set! (-> v1-5 width) (the float 440))
|
||||
)
|
||||
(let ((v1-6 gp-0))
|
||||
(set! (-> v1-6 height) (the float 80))
|
||||
)
|
||||
(set-width! gp-0 440)
|
||||
(set-height! gp-0 80)
|
||||
(set! (-> gp-0 flags) (font-flags shadow kerning))
|
||||
(format (clear *temp-string*) "~S / ~S ~D~%" (-> self mode) (-> self state name) (-> self which))
|
||||
(print-game-text *temp-string* gp-0 #f 44 (bucket-id progress))
|
||||
@@ -1894,15 +1890,9 @@
|
||||
(new 'stack 'font-context *font-default-matrix* 20 80 0.0 (font-color default) (font-flags shadow kerning))
|
||||
)
|
||||
)
|
||||
(let ((v1-17 gp-1))
|
||||
(set! (-> v1-17 scale) 0.8)
|
||||
)
|
||||
(let ((v1-18 gp-1))
|
||||
(set! (-> v1-18 width) (the float 432))
|
||||
)
|
||||
(let ((v1-19 gp-1))
|
||||
(set! (-> v1-19 height) (the float 20))
|
||||
)
|
||||
(set-scale! gp-1 0.8)
|
||||
(set-width! gp-1 432)
|
||||
(set-height! gp-1 20)
|
||||
(set! (-> gp-1 flags) (font-flags shadow kerning middle middle-vert large))
|
||||
(when (and (>= 1 (-> *game-info* auto-save-count)) (-> self next-state) (= (-> self next-state name) 'save))
|
||||
(print-game-text
|
||||
@@ -1914,12 +1904,8 @@
|
||||
)
|
||||
(set! (-> gp-1 origin x) 20.0)
|
||||
(set! (-> gp-1 origin y) 130.0)
|
||||
(let ((v1-30 gp-1))
|
||||
(set! (-> v1-30 scale) 0.7)
|
||||
)
|
||||
(let ((v1-31 gp-1))
|
||||
(set! (-> v1-31 height) (the float 200))
|
||||
)
|
||||
(set-scale! gp-1 0.7)
|
||||
(set-height! gp-1 200)
|
||||
(let ((s5-2 print-game-text))
|
||||
(format (clear *temp-string*) (lookup-text! *common-text* (text-id progress-memcard-dont-remove) #f) 1)
|
||||
(s5-2 *temp-string* gp-1 #f 44 (bucket-id progress))
|
||||
|
||||
+2
-7
@@ -1361,13 +1361,8 @@
|
||||
(set! (-> s5-1 use-mouse-tumble-point) (-> s4-1 use-mouse-tumble-point))
|
||||
(set! (-> s5-1 mouse-tumble-point quad) (-> s4-1 mouse-tumble-point quad))
|
||||
(set! (-> s5-1 handle-of-interest) (-> s4-1 handle-of-interest))
|
||||
(let* ((s3-1 (handle->process (-> s5-1 handle-of-interest)))
|
||||
(a0-147 (the-as process-focusable (if (type? s3-1 process-focusable)
|
||||
(the-as process-focusable s3-1)
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((a0-147 (the-as process-focusable (as-type (handle->process (-> s5-1 handle-of-interest)) process-focusable)))
|
||||
)
|
||||
(when (the-as process a0-147)
|
||||
(set! (-> s5-1 use-point-of-interest) #t)
|
||||
(set! (-> s5-1 point-of-interest quad) (-> (get-trans a0-147 4) quad))
|
||||
|
||||
+6
-20
@@ -100,11 +100,7 @@
|
||||
(s5-0 (/ (the-as int (car (cdr a0-1))) 8))
|
||||
(s4-0 (car (cdr (cdr a0-1))))
|
||||
(s3-0 (car (cdr (cdr (cdr a0-1)))))
|
||||
(s2-0 (-> (the-as symbol v1-0) value))
|
||||
(v1-1 (if (type? s2-0 level-load-info)
|
||||
(the-as level-load-info s2-0)
|
||||
)
|
||||
)
|
||||
(v1-1 (as-type (-> (the-as symbol v1-0) value) level-load-info))
|
||||
)
|
||||
(when v1-1
|
||||
(set! (-> v1-1 borrow-level s5-0) (the-as symbol s4-0))
|
||||
@@ -1456,15 +1452,9 @@
|
||||
)
|
||||
)
|
||||
(set! (-> gp-0 origin x) 120.0)
|
||||
(let ((v1-7 gp-0))
|
||||
(set! (-> v1-7 scale) 0.7)
|
||||
)
|
||||
(let ((v1-8 gp-0))
|
||||
(set! (-> v1-8 width) (the float 300))
|
||||
)
|
||||
(let ((v1-9 gp-0))
|
||||
(set! (-> v1-9 height) (the float 35))
|
||||
)
|
||||
(set-scale! gp-0 0.7)
|
||||
(set-width! gp-0 300)
|
||||
(set-height! gp-0 35)
|
||||
(set! (-> gp-0 flags) (font-flags shadow kerning middle middle-vert large))
|
||||
(let ((s4-0 (if (logtest? (-> this flags) (fail-mission-flags famflags-2))
|
||||
(the-as int (-> this fail-message))
|
||||
@@ -1480,16 +1470,12 @@
|
||||
)
|
||||
)
|
||||
(when (= (-> this message) (fail-mission-message fammsg-1))
|
||||
(let ((v1-17 gp-0))
|
||||
(set! (-> v1-17 height) (the float 95))
|
||||
)
|
||||
(set-height! gp-0 95)
|
||||
(let ((s5-1 print-game-text))
|
||||
(format (clear *temp-string*) (lookup-text! *common-text* (text-id try-again?) #f) 1)
|
||||
(s5-1 *temp-string* gp-0 #f 44 (bucket-id progress))
|
||||
)
|
||||
(let ((v1-19 gp-0))
|
||||
(set! (-> v1-19 height) (the float 155))
|
||||
)
|
||||
(set-height! gp-0 155)
|
||||
(let ((s5-2 print-game-text))
|
||||
(format (clear *temp-string*) (lookup-text! *common-text* (text-id yes-no-prompt) #f) 1)
|
||||
(s5-2 *temp-string* gp-0 #f 44 (bucket-id progress))
|
||||
|
||||
+2
-12
@@ -424,12 +424,7 @@
|
||||
(dotimes (s4-0 (-> s5-0 art-group-array length))
|
||||
(let ((s3-0 (-> s5-0 art-group-array s4-0)))
|
||||
(dotimes (s2-0 (-> s3-0 length))
|
||||
(let* ((s1-0 (-> s3-0 data s2-0))
|
||||
(a0-3 (if (type? s1-0 merc-ctrl)
|
||||
s1-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((a0-3 (the-as art-element (as-type (-> s3-0 data s2-0) merc-ctrl))))
|
||||
(if a0-3
|
||||
(merc-stats-display (the-as merc-ctrl a0-3))
|
||||
)
|
||||
@@ -453,12 +448,7 @@
|
||||
(dotimes (s4-0 (-> s5-0 art-group-array length))
|
||||
(let ((s3-0 (-> s5-0 art-group-array s4-0)))
|
||||
(dotimes (s2-0 (-> s3-0 length))
|
||||
(let* ((s1-0 (-> s3-0 data s2-0))
|
||||
(v1-9 (if (type? s1-0 merc-ctrl)
|
||||
s1-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-9 (the-as art-element (as-type (-> s3-0 data s2-0) merc-ctrl))))
|
||||
(if v1-9
|
||||
(format #t "~30s: ~f~%" (-> v1-9 name) (-> (the-as merc-ctrl v1-9) header longest-edge))
|
||||
)
|
||||
|
||||
+9
-32
@@ -237,13 +237,9 @@
|
||||
(defmethod link-art! ((this art-group))
|
||||
(when this
|
||||
(countdown (s5-0 (-> this length))
|
||||
(let* ((s3-0 (-> this data s5-0))
|
||||
(s4-0 (if (type? s3-0 art-joint-anim)
|
||||
(the-as art-joint-anim s3-0)
|
||||
)
|
||||
)
|
||||
(s2-0 #f)
|
||||
)
|
||||
(let ((s4-0 (as-type (-> this data s5-0) art-joint-anim))
|
||||
(s2-0 #f)
|
||||
)
|
||||
(when s4-0
|
||||
(let ((s3-1 7))
|
||||
(while (begin (label cfg-24) (nonzero? s3-1))
|
||||
@@ -290,13 +286,9 @@
|
||||
(defmethod unlink-art! ((this art-group))
|
||||
(when this
|
||||
(countdown (s5-0 (-> this length))
|
||||
(let* ((s3-0 (-> this data s5-0))
|
||||
(s4-0 (if (type? s3-0 art-joint-anim)
|
||||
(the-as art-joint-anim s3-0)
|
||||
)
|
||||
)
|
||||
(s3-1 #f)
|
||||
)
|
||||
(let ((s4-0 (as-type (-> this data s5-0) art-joint-anim))
|
||||
(s3-1 #f)
|
||||
)
|
||||
(when s4-0
|
||||
(let ((s2-0 7))
|
||||
(while (begin (label cfg-13) (nonzero? s2-0))
|
||||
@@ -2068,12 +2060,7 @@
|
||||
)
|
||||
)
|
||||
(when (= arg5 -99.0)
|
||||
(let ((s2-1 arg0))
|
||||
(set! sv-28 (if (type? s2-1 process-drawable)
|
||||
(the-as process-drawable s2-1)
|
||||
)
|
||||
)
|
||||
)
|
||||
(set! sv-28 (as-type arg0 process-drawable))
|
||||
(set! arg5 (if sv-28
|
||||
(vector-vector-distance (target-pos 0) (-> sv-28 root trans))
|
||||
-1.0
|
||||
@@ -2106,12 +2093,7 @@
|
||||
(((gui-action queue) (gui-action play) (gui-action playing) (gui-action fade))
|
||||
(let ((f30-0 (-> arg0 priority)))
|
||||
(when (= f30-0 -99.0)
|
||||
(let* ((s2-0 (get-process arg0))
|
||||
(v1-10 (if (type? s2-0 process-drawable)
|
||||
(the-as process-drawable s2-0)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-10 (as-type (get-process arg0) process-drawable)))
|
||||
(set! f30-0 (cond
|
||||
((= (-> arg0 id) (-> this ids (-> arg0 channel)))
|
||||
-1.0
|
||||
@@ -2285,12 +2267,7 @@
|
||||
(when (and (logtest? (-> arg0 flags) (gui-connection-flags gcf1 fo-curve fo-min fo-max))
|
||||
(logtest? (-> arg0 flags) (gui-connection-flags gcf0))
|
||||
)
|
||||
(let* ((s5-1 (get-process arg0))
|
||||
(s4-1 (if (type? s5-1 process-drawable)
|
||||
s5-1
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((s4-1 (the-as process (as-type (get-process arg0) process-drawable))))
|
||||
(when (and s4-1 (nonzero? (-> (the-as process-drawable s4-1) root)))
|
||||
(when *sound-player-enable*
|
||||
(let ((s5-2 (the-as sound-rpc-set-param (get-sound-buffer-entry))))
|
||||
|
||||
+2
-12
@@ -718,12 +718,7 @@
|
||||
;; definition for method 45 of type nav-mesh
|
||||
(defmethod link-to-other-mesh ((this nav-mesh) (arg0 nav-mesh-link))
|
||||
(when (not (-> arg0 dest-mesh))
|
||||
(let* ((s4-0 (entity-nav-mesh-by-aid (the-as actor-id (-> arg0 dest-mesh-id))))
|
||||
(v1-1 (if (type? s4-0 entity-nav-mesh)
|
||||
s4-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-1 (as-type (entity-nav-mesh-by-aid (the-as actor-id (-> arg0 dest-mesh-id))) entity-nav-mesh)))
|
||||
(when v1-1
|
||||
(let ((a0-3 (-> v1-1 nav-mesh))
|
||||
(v1-2 (the-as nav-mesh-link #f))
|
||||
@@ -2600,12 +2595,7 @@
|
||||
;; definition for function get-nav-mesh
|
||||
(defun get-nav-mesh ((arg0 actor-id))
|
||||
(let ((gp-0 (the-as nav-mesh #f)))
|
||||
(let* ((s5-0 (entity-nav-mesh-by-aid arg0))
|
||||
(v1-0 (if (type? s5-0 entity-nav-mesh)
|
||||
s5-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-0 (as-type (entity-nav-mesh-by-aid arg0) entity-nav-mesh)))
|
||||
(if v1-0
|
||||
(set! gp-0 (-> v1-0 nav-mesh))
|
||||
)
|
||||
|
||||
+4
-21
@@ -1424,11 +1424,7 @@
|
||||
(format *stdcon* "rigid-body-object got touched~%")
|
||||
)
|
||||
(when (zero? (-> arg0 rbody))
|
||||
(let ((s3-0 (if (type? arg0 process-focusable)
|
||||
(the-as process-focusable arg0)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((s3-0 (as-type arg0 process-focusable)))
|
||||
(when s3-0
|
||||
(when (logtest? (-> s3-0 mask) (process-mask target))
|
||||
(logior! (-> this flags) (rigid-body-object-flag player-touching))
|
||||
@@ -1455,11 +1451,7 @@
|
||||
(('edge-grabbed 'pilot-edge-grab)
|
||||
(let ((s5-2 (the-as object (-> arg3 param 0))))
|
||||
(when (not (logtest? (-> this flags) (rigid-body-object-flag player-impulse-force)))
|
||||
(let ((a0-25 (if (type? arg0 process-focusable)
|
||||
(the-as process-focusable arg0)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((a0-25 (as-type arg0 process-focusable)))
|
||||
(when a0-25
|
||||
(let ((f0-1 (/ 163840.0 (get-inv-mass a0-25))))
|
||||
(logior! (-> this flags) (rigid-body-object-flag player-touching player-edge-grabbing player-contact-force))
|
||||
@@ -1476,12 +1468,7 @@
|
||||
(('ridden)
|
||||
(let ((v1-45 (the-as object (-> arg3 param 0))))
|
||||
(when (the-as uint v1-45)
|
||||
(let* ((s5-3 (handle->process (-> (the-as focus v1-45) handle)))
|
||||
(a0-34 (if (type? s5-3 process-focusable)
|
||||
(the-as process-focusable s5-3)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((a0-34 (as-type (handle->process (-> (the-as focus v1-45) handle)) process-focusable)))
|
||||
(when (and a0-34
|
||||
(logtest? (-> a0-34 mask) (process-mask target))
|
||||
(not (logtest? (-> a0-34 focus-status) (focus-status on-water under-water)))
|
||||
@@ -1503,11 +1490,7 @@
|
||||
)
|
||||
(('bonk)
|
||||
(when #t
|
||||
(let ((a0-38 (if (type? arg0 process-focusable)
|
||||
(the-as process-focusable arg0)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((a0-38 (as-type arg0 process-focusable)))
|
||||
(when a0-38
|
||||
(logior! (-> this flags) (rigid-body-object-flag player-touching player-impulse-force))
|
||||
(set! (-> this player-force-position quad) (-> a0-38 root trans quad))
|
||||
|
||||
+21
-36
@@ -188,13 +188,9 @@
|
||||
)
|
||||
(let ((f30-0 (fill-and-probe-using-line-sphere *collide-cache* arg0)))
|
||||
(when (and arg1 (>= f30-0 0.0) (>= 0.0 (vector-dot (-> arg0 best-other-tri normal) (-> this dir))))
|
||||
(let* ((s3-0 (new 'stack-no-clear 'touching-shapes-entry))
|
||||
(s2-0 (-> arg0 best-other-tri collide-ptr))
|
||||
(v1-12 (if (type? s2-0 collide-shape-prim)
|
||||
(the-as collide-shape-prim s2-0)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((s3-0 (new 'stack-no-clear 'touching-shapes-entry))
|
||||
(v1-12 (as-type (-> arg0 best-other-tri collide-ptr) collide-shape-prim))
|
||||
)
|
||||
(set! (-> s3-0 cshape1) #f)
|
||||
(set! (-> s3-0 cshape2) (if v1-12
|
||||
(-> v1-12 cshape)
|
||||
@@ -262,11 +258,7 @@
|
||||
(defmethod combo-tracker-method-13 ((this combo-tracker) (arg0 handle) (arg1 vector) (arg2 float) (arg3 vector) (arg4 float))
|
||||
(cond
|
||||
((send-event (handle->process arg0) 'combo)
|
||||
(let ((gp-1 (handle->process arg0)))
|
||||
(if (type? gp-1 process-focusable)
|
||||
gp-1
|
||||
)
|
||||
)
|
||||
(the-as basic (as-type (handle->process arg0) process-focusable))
|
||||
)
|
||||
(else
|
||||
(let ((s1-0 (new 'stack-no-clear 'sphere))
|
||||
@@ -286,25 +278,23 @@
|
||||
(-> s2-1 allocated-length)
|
||||
)
|
||||
)
|
||||
(let ((gp-2 (find-nearest-focusable
|
||||
(the-as (array collide-shape) s2-1)
|
||||
arg1
|
||||
arg2
|
||||
(if (= arg4 65536.0)
|
||||
(search-info-flag crate enemy combo)
|
||||
(search-info-flag crate enemy prefer-angle cull-angle combo)
|
||||
(the-as basic (as-type
|
||||
(find-nearest-focusable
|
||||
(the-as (array collide-shape) s2-1)
|
||||
arg1
|
||||
arg2
|
||||
(if (= arg4 65536.0)
|
||||
(search-info-flag crate enemy combo)
|
||||
(search-info-flag crate enemy prefer-angle cull-angle combo)
|
||||
)
|
||||
(search-info-flag)
|
||||
arg3
|
||||
(the-as vector #f)
|
||||
arg4
|
||||
)
|
||||
(search-info-flag)
|
||||
arg3
|
||||
(the-as vector #f)
|
||||
arg4
|
||||
)
|
||||
)
|
||||
)
|
||||
(if (type? gp-2 process-focusable)
|
||||
gp-2
|
||||
)
|
||||
)
|
||||
process-focusable
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
@@ -335,12 +325,7 @@
|
||||
(set! (-> a1-4 from) (process->ppointer pp))
|
||||
(set! (-> a1-4 num-params) 0)
|
||||
(set! (-> a1-4 message) 'nav-control)
|
||||
(let* ((s3-0 (send-event-function (handle->process (-> this target)) a1-4))
|
||||
(s4-1 (if (type? s3-0 nav-control)
|
||||
s3-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((s4-1 (the-as object (as-type (send-event-function (handle->process (-> this target)) a1-4) nav-control))))
|
||||
(when s4-1
|
||||
(let ((a2-3 ((method-of-type nav-control find-poly-containing-point-1) (the-as nav-control s4-1) arg1)))
|
||||
(if a2-3
|
||||
|
||||
+1
-6
@@ -43,12 +43,7 @@
|
||||
"If the focused process is not dead,
|
||||
check that the [[collide-spec]] of the focus and the process match."
|
||||
(when (and proc (not (logtest? (-> proc focus-status) (focus-status disable dead))))
|
||||
(let* ((root (-> proc root))
|
||||
(cshape (if (type? root collide-shape)
|
||||
root
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((cshape (as-type (-> proc root) collide-shape)))
|
||||
(and cshape (logtest? (-> this collide-with) (-> cshape root-prim prim-core collide-as)))
|
||||
)
|
||||
)
|
||||
|
||||
+5
-25
@@ -538,12 +538,7 @@
|
||||
(remove! a0-3)
|
||||
)
|
||||
)
|
||||
(let* ((s5-0 (-> this root))
|
||||
(a0-5 (if (type? s5-0 collide-shape)
|
||||
s5-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((a0-5 (the-as trsqv (as-type (-> this root) collide-shape))))
|
||||
(when a0-5
|
||||
(let ((a2-0 (-> (the-as collide-shape a0-5) actor-hash-index))
|
||||
(v1-12 *actor-hash*)
|
||||
@@ -578,12 +573,7 @@
|
||||
(if (-> self entity)
|
||||
(logior! (-> self entity extra perm status) (entity-perm-status error))
|
||||
)
|
||||
(let* ((s5-0 (-> self root))
|
||||
(v1-6 (if (type? s5-0 collide-shape)
|
||||
s5-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-6 (the-as trsqv (as-type (-> self root) collide-shape))))
|
||||
(when v1-6
|
||||
(let ((a0-5 (-> (the-as collide-shape v1-6) root-prim)))
|
||||
(set! (-> a0-5 prim-core collide-as) (collide-spec))
|
||||
@@ -715,12 +705,7 @@
|
||||
(-> arg1 light-index)
|
||||
)
|
||||
)
|
||||
(let* ((gp-1 (ppointer->process (-> arg0 parent)))
|
||||
(v1-54 (if (type? gp-1 process-drawable)
|
||||
gp-1
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-54 (the-as process-tree (as-type (ppointer->process (-> arg0 parent)) process-drawable))))
|
||||
(when (and v1-54 (nonzero? (-> (the-as process-drawable v1-54) draw)))
|
||||
(set! (-> s2-0 light-index) (-> (the-as process-drawable v1-54) draw light-index))
|
||||
(set! (-> s2-0 shadow-mask) (-> (the-as process-drawable v1-54) draw shadow-mask))
|
||||
@@ -1884,14 +1869,9 @@
|
||||
;; WARN: Return type mismatch object vs process-focusable.
|
||||
(defbehavior find-offending-process-focusable process-drawable ((arg0 process-tree) (arg1 attack-info))
|
||||
(let ((s5-0 (the-as object #f)))
|
||||
(when (and arg1 (logtest? (-> arg1 mask) (attack-mask attacker)))
|
||||
(let ((s4-0 (handle->process (-> arg1 attacker))))
|
||||
(set! s5-0 (if (type? s4-0 process-focusable)
|
||||
s4-0
|
||||
)
|
||||
)
|
||||
(if (and arg1 (logtest? (-> arg1 mask) (attack-mask attacker)))
|
||||
(set! s5-0 (the-as object (as-type (handle->process (-> arg1 attacker)) process-focusable)))
|
||||
)
|
||||
)
|
||||
(when (not (the-as process s5-0))
|
||||
(let ((a1-3 (new 'stack-no-clear 'event-message-block)))
|
||||
(set! (-> a1-3 from) (process->ppointer self))
|
||||
|
||||
+3
-9
@@ -236,15 +236,9 @@
|
||||
(new 'stack 'font-context *font-default-matrix* 32 280 0.0 (font-color default) (font-flags shadow kerning))
|
||||
)
|
||||
)
|
||||
(let ((v1-84 s5-1))
|
||||
(set! (-> v1-84 width) (the float 340))
|
||||
)
|
||||
(let ((v1-85 s5-1))
|
||||
(set! (-> v1-85 height) (the float 80))
|
||||
)
|
||||
(let ((v1-86 s5-1))
|
||||
(set! (-> v1-86 scale) 0.9)
|
||||
)
|
||||
(set-width! s5-1 340)
|
||||
(set-height! s5-1 80)
|
||||
(set-scale! s5-1 0.9)
|
||||
(set! (-> s5-1 flags) (font-flags shadow kerning middle-vert large))
|
||||
(print-game-text (lookup-text! *common-text* (-> self talk-message) #f) s5-1 #f 44 (bucket-id progress))
|
||||
)
|
||||
|
||||
+29
-60
@@ -203,19 +203,17 @@
|
||||
(goto cfg-211)
|
||||
)
|
||||
)
|
||||
(let* ((s4-1 (art-group-get-by-name *level* (-> this art-group) (the-as (pointer uint32) #f)))
|
||||
(s2-0 (if (type? s4-1 skeleton-group)
|
||||
(the-as skeleton-group s4-1)
|
||||
)
|
||||
)
|
||||
(s0-0 (-> arg0 level))
|
||||
(s3-0
|
||||
(or (string= (-> this name) "jak-highres")
|
||||
(string= (-> this name) "jak-highres-prison")
|
||||
(string= (-> this name) "darkjak-highres")
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((s2-0
|
||||
(as-type (art-group-get-by-name *level* (-> this art-group) (the-as (pointer uint32) #f)) skeleton-group)
|
||||
)
|
||||
(s0-0 (-> arg0 level))
|
||||
(s3-0
|
||||
(or (string= (-> this name) "jak-highres")
|
||||
(string= (-> this name) "jak-highres-prison")
|
||||
(string= (-> this name) "darkjak-highres")
|
||||
)
|
||||
)
|
||||
)
|
||||
(set! (-> arg0 level) #f)
|
||||
(set! s4-0
|
||||
(when s2-0
|
||||
@@ -611,14 +609,14 @@
|
||||
(-> *level* default-level)
|
||||
)
|
||||
)
|
||||
(v1-55 (when level
|
||||
(let ((s0-0 (art-group-get-by-name *level* (-> s2-0 art-group) (the-as (pointer uint32) #f))))
|
||||
(if (type? s0-0 skeleton-group)
|
||||
s0-0
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
(v1-55
|
||||
(if level
|
||||
(the-as
|
||||
art-group
|
||||
(as-type (art-group-get-by-name *level* (-> s2-0 art-group) (the-as (pointer uint32) #f)) skeleton-group)
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
(cond
|
||||
((or (not s1-0) (not (or (= (-> s1-0 status) 'active) (= (-> s1-0 status) 'reserved))))
|
||||
@@ -849,23 +847,15 @@
|
||||
(new 'stack 'font-context *font-default-matrix* 20 290 0.0 (font-color default) (font-flags shadow kerning))
|
||||
)
|
||||
)
|
||||
(let ((v1-20 s2-0))
|
||||
(set! (-> v1-20 width) (the float 465))
|
||||
)
|
||||
(let ((v1-21 s2-0))
|
||||
(set! (-> v1-21 height) (the float 70))
|
||||
)
|
||||
(let ((v1-22 s2-0))
|
||||
(set! (-> v1-22 scale) 0.5)
|
||||
)
|
||||
(set-width! s2-0 465)
|
||||
(set-height! s2-0 70)
|
||||
(set-scale! s2-0 0.5)
|
||||
(set! (-> s2-0 flags) (font-flags shadow kerning middle large))
|
||||
(case (-> s3-0 type)
|
||||
((string)
|
||||
(when (= (-> *setting-control* user-default subtitle-language) (language-enum korean))
|
||||
(set! s3-0 (convert-korean-text (the-as string s3-0)))
|
||||
(let ((v1-27 s2-0))
|
||||
(set! (-> v1-27 scale) 0.6)
|
||||
)
|
||||
(set-scale! s2-0 0.6)
|
||||
)
|
||||
(set! (-> s2-0 flags) (font-flags kerning middle middle-vert large))
|
||||
(+! (-> s2-0 origin x) -1.0)
|
||||
@@ -1408,12 +1398,7 @@
|
||||
)
|
||||
(when (logtest? gp-4 (scene-controls special-fma-spheres))
|
||||
(dotimes (s5-3 (-> self scene actor length))
|
||||
(let* ((s4-1 (handle->process (-> self scene actor s5-3 process)))
|
||||
(v1-63 (if (type? s4-1 process-drawable)
|
||||
(the-as process-drawable s4-1)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-63 (as-type (handle->process (-> self scene actor s5-3 process)) process-drawable)))
|
||||
(if (and v1-63 (nonzero? (-> v1-63 draw)))
|
||||
(add-debug-sphere
|
||||
#t
|
||||
@@ -1428,12 +1413,7 @@
|
||||
)
|
||||
(when (logtest? gp-4 (scene-controls scene-controls-7))
|
||||
(dotimes (s5-4 (-> self scene actor length))
|
||||
(let* ((s4-2 (handle->process (-> self scene actor s5-4 process)))
|
||||
(v1-79 (if (type? s4-2 process-drawable)
|
||||
(the-as process-drawable s4-2)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-79 (as-type (handle->process (-> self scene actor s5-4 process)) process-drawable)))
|
||||
(if (and v1-79 (nonzero? (-> v1-79 draw)))
|
||||
(format
|
||||
*stdcon*
|
||||
@@ -1452,12 +1432,7 @@
|
||||
)
|
||||
(when (logtest? gp-4 (scene-controls scene-controls-8))
|
||||
(dotimes (gp-5 (-> self scene actor length))
|
||||
(let* ((s5-5 (handle->process (-> self scene actor gp-5 process)))
|
||||
(v1-94 (if (type? s5-5 process-drawable)
|
||||
(the-as process-drawable s5-5)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-94 (as-type (handle->process (-> self scene actor gp-5 process)) process-drawable)))
|
||||
(if (and v1-94 (nonzero? (-> v1-94 draw)))
|
||||
(add-debug-text-3d
|
||||
#t
|
||||
@@ -1485,15 +1460,9 @@
|
||||
(new 'stack 'font-context *font-default-matrix* 36 60 0.0 (font-color default) (font-flags shadow kerning))
|
||||
)
|
||||
)
|
||||
(let ((v1-121 gp-6))
|
||||
(set! (-> v1-121 width) (the float 440))
|
||||
)
|
||||
(let ((v1-122 gp-6))
|
||||
(set! (-> v1-122 height) (the float 48))
|
||||
)
|
||||
(let ((v1-123 gp-6))
|
||||
(set! (-> v1-123 scale) 0.5)
|
||||
)
|
||||
(set-width! gp-6 440)
|
||||
(set-height! gp-6 48)
|
||||
(set-scale! gp-6 0.5)
|
||||
(set! (-> gp-6 flags) (font-flags shadow kerning middle large))
|
||||
(print-game-text
|
||||
(lookup-text!
|
||||
|
||||
+1
-6
@@ -2571,12 +2571,7 @@
|
||||
(set! (-> self control unknown-vector39 quad) (-> self control quat quad))
|
||||
(ja :group! s4-0 :num! (seek!) :frame-num 0.0)
|
||||
(until #f
|
||||
(let* ((s3-0 (handle->process arg0))
|
||||
(s4-1 (if (type? s3-0 process-focusable)
|
||||
s3-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((s4-1 (the-as process (as-type (handle->process arg0) process-focusable))))
|
||||
(when s4-1
|
||||
(set! (-> self control unknown-vector38 quad) (-> (get-trans (the-as process-focusable s4-1) 0) quad))
|
||||
(+! (-> self control unknown-vector38 y) 4096.0)
|
||||
|
||||
+2
-12
@@ -363,12 +363,7 @@
|
||||
(let ((s5-0 (new 'stack-no-clear 'matrix)))
|
||||
(let ((s4-0 (new 'stack-no-clear 'vector)))
|
||||
(vector-normalize-copy! s4-0 (-> self core-velocity) 1.0)
|
||||
(let* ((s3-0 (handle->process (-> self track-target)))
|
||||
(v1-3 (if (type? s3-0 process-drawable)
|
||||
(the-as process-drawable s3-0)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-3 (as-type (handle->process (-> self track-target)) process-drawable)))
|
||||
(when v1-3
|
||||
(let* ((s3-2 (vector-! (new 'stack-no-clear 'vector) (-> v1-3 root trans) (-> self core-position)))
|
||||
(f0-0 (vector-normalize-ret-len! s3-2 1.0))
|
||||
@@ -768,12 +763,7 @@
|
||||
)
|
||||
)
|
||||
(countdown (s5-3 gp-2)
|
||||
(let* ((s3-1 (handle->process (-> self result-array s5-3)))
|
||||
(s4-1 (if (type? s3-1 process-focusable)
|
||||
s3-1
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((s4-1 (the-as process (as-type (handle->process (-> self result-array s5-3)) process-focusable))))
|
||||
(when s4-1
|
||||
(send-event s4-1 'attack #f (static-attack-info ((id (new-attack-id)) (mode 'explode) (damage 16.0))))
|
||||
(process-spawn-function
|
||||
|
||||
+4
-13
@@ -147,12 +147,7 @@
|
||||
;; definition for method 29 of type gun-red-shot
|
||||
;; INFO: Used lq/sq
|
||||
(defmethod fire! ((this gun-red-shot) (arg0 process-drawable) (arg1 int))
|
||||
(let* ((s5-0 arg0)
|
||||
(v1-0 (if (type? s5-0 process-drawable)
|
||||
s5-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-0 (as-type arg0 process-drawable)))
|
||||
(when v1-0
|
||||
(let* ((s5-2 (vector-! (new 'stack-no-clear 'vector) (-> v1-0 root trans) (-> this start-pos)))
|
||||
(f30-0 (* (if (< (vector-length s5-2) 24576.0)
|
||||
@@ -210,13 +205,9 @@
|
||||
"Create all 19 probe vectors"
|
||||
(let ((s5-0 (-> this probe-count)))
|
||||
(when (< s5-0 19)
|
||||
(let* ((s4-0 (-> arg0 process))
|
||||
(a0-2 (if (type? s4-0 process-focusable)
|
||||
(the-as process-focusable s4-0)
|
||||
)
|
||||
)
|
||||
(s4-1 (new 'stack-no-clear 'vector))
|
||||
)
|
||||
(let ((a0-2 (as-type (-> arg0 process) process-focusable))
|
||||
(s4-1 (new 'stack-no-clear 'vector))
|
||||
)
|
||||
(if a0-2
|
||||
(set! (-> s4-1 quad) (-> (get-trans a0-2 3) quad))
|
||||
(set! (-> s4-1 quad) (-> arg0 root-prim prim-core world-sphere quad))
|
||||
|
||||
+4
-8
@@ -991,14 +991,10 @@
|
||||
((>= f0-3 0.0)
|
||||
(vector+float*! (-> s4-0 start-pos) (-> s4-0 start-pos) (-> s4-0 move-dist) f0-3)
|
||||
(vector+float*! (-> s4-0 start-pos) (-> s4-0 start-pos) (-> s3-0 0) (-> this track-beam-size))
|
||||
(let* ((s2-0 (-> s4-0 best-other-tri collide-ptr))
|
||||
(s0-0 (if (type? s2-0 collide-shape-prim)
|
||||
(the-as collide-shape-prim s2-0)
|
||||
)
|
||||
)
|
||||
(s1-0 (vector-normalize! (vector-! (new 'stack-no-clear 'vector) s5-0 (-> s4-0 start-pos)) 1638.4))
|
||||
(s2-1 (new 'stack-no-clear 'vector))
|
||||
)
|
||||
(let ((s0-0 (as-type (-> s4-0 best-other-tri collide-ptr) collide-shape-prim))
|
||||
(s1-0 (vector-normalize! (vector-! (new 'stack-no-clear 'vector) s5-0 (-> s4-0 start-pos)) 1638.4))
|
||||
(s2-1 (new 'stack-no-clear 'vector))
|
||||
)
|
||||
(set! (-> s2-1 quad) (-> s4-0 start-pos quad))
|
||||
(cond
|
||||
((and s0-0
|
||||
|
||||
+4
-24
@@ -111,12 +111,7 @@
|
||||
(set! (-> gp-0 max-distance) 8192.0)
|
||||
(set! (-> gp-0 local-point quad) (-> arg2 quad))
|
||||
(set! (-> gp-0 local-normal quad) (-> arg3 quad))
|
||||
(let* ((s5-1 (-> arg0 root))
|
||||
(v1-7 (if (type? s5-1 collide-shape)
|
||||
(the-as collide-shape s5-1)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-7 (as-type (-> arg0 root) collide-shape)))
|
||||
(when v1-7
|
||||
(set! (-> gp-0 backup-radius) (-> v1-7 root-prim local-sphere w))
|
||||
(set! (-> gp-0 carry-radius) (-> v1-7 root-prim local-sphere w))
|
||||
@@ -238,12 +233,7 @@
|
||||
(set! (-> this pickup-time) (-> this process 0 clock frame-counter))
|
||||
(set! (-> arg0 pickup-time) (-> arg0 process 0 clock frame-counter))
|
||||
(set! (-> arg0 grab-trans-blend) 1.0)
|
||||
(let* ((s4-0 (the-as collide-shape (-> arg0 process 0 control)))
|
||||
(v1-17 (if (type? (the-as control-info s4-0) collide-shape)
|
||||
s4-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-17 (as-type (-> arg0 process 0 control) collide-shape)))
|
||||
(if v1-17
|
||||
(set! (-> v1-17 root-prim local-sphere w) (-> arg0 carry-radius))
|
||||
)
|
||||
@@ -320,12 +310,7 @@
|
||||
(set! (-> a1-2 y) 0.0)
|
||||
(set-heading-vec-clear-roll-pitch! (-> arg0 process 0 control) a1-2)
|
||||
)
|
||||
(let* ((s4-0 (the-as collide-shape (-> arg0 process 0 control)))
|
||||
(v1-9 (if (type? (the-as control-info s4-0) collide-shape)
|
||||
s4-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-9 (as-type (-> arg0 process 0 control) collide-shape)))
|
||||
(if v1-9
|
||||
(set! (-> v1-9 root-prim local-sphere w) (-> arg0 backup-radius))
|
||||
)
|
||||
@@ -453,12 +438,7 @@
|
||||
(set! (-> this pickup-time) (-> this process 0 clock frame-counter))
|
||||
(set! (-> arg0 pickup-time) (-> arg0 process 0 clock frame-counter))
|
||||
(set! (-> arg0 grab-trans-blend) 1.0)
|
||||
(let* ((s2-0 (the-as collide-shape (-> arg0 process 0 control)))
|
||||
(v1-17 (if (type? (the-as control-info s2-0) collide-shape)
|
||||
s2-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-17 (as-type (-> arg0 process 0 control) collide-shape)))
|
||||
(if v1-17
|
||||
(set! (-> v1-17 root-prim local-sphere w) (-> arg0 carry-radius))
|
||||
)
|
||||
|
||||
+10
-19
@@ -458,19 +458,15 @@
|
||||
(when (-> self control danger-mode)
|
||||
(-> block param 1)
|
||||
(let* ((gp-1 (the-as object (-> block param 3)))
|
||||
(s5-1 (-> (the-as collide-query gp-1) best-other-tri collide-ptr))
|
||||
(s4-1 (if (type? s5-1 collide-shape-prim)
|
||||
(the-as collide-shape-prim s5-1)
|
||||
)
|
||||
)
|
||||
(s3-1 (if s4-1
|
||||
(-> s4-1 cshape process)
|
||||
(the-as process-drawable #f)
|
||||
)
|
||||
)
|
||||
(s5-2 (if (type? s3-1 process-focusable)
|
||||
s3-1
|
||||
)
|
||||
(s4-1 (as-type (-> (the-as collide-query gp-1) best-other-tri collide-ptr) collide-shape-prim))
|
||||
(s5-2 (the-as process-drawable (as-type
|
||||
(if s4-1
|
||||
(-> s4-1 cshape process)
|
||||
(the-as process-drawable #f)
|
||||
)
|
||||
process-focusable
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
(if (and s4-1
|
||||
@@ -2480,12 +2476,7 @@
|
||||
(set! (-> self control unknown-vector38 quad) (-> self control trans quad))
|
||||
(set! (-> self control unknown-vector39 quad) (-> self control quat quad))
|
||||
(set! (-> self control unknown-vector40 quad) (-> self control quat quad))
|
||||
(let* ((gp-1 (handle->process arg0))
|
||||
(v1-23 (if (type? gp-1 process-drawable)
|
||||
gp-1
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-23 (the-as process (as-type (handle->process arg0) process-drawable))))
|
||||
(when v1-23
|
||||
(set! (-> self control unknown-vector38 quad) (-> (the-as process-drawable v1-23) root trans quad))
|
||||
(set! (-> self control unknown-vector40 quad) (-> (the-as process-drawable v1-23) root quat quad))
|
||||
|
||||
+3
-9
@@ -163,15 +163,9 @@
|
||||
(new 'stack 'font-context *font-default-matrix* 32 320 0.0 (font-color default) (font-flags shadow kerning))
|
||||
)
|
||||
)
|
||||
(let ((v1-31 gp-0))
|
||||
(set! (-> v1-31 width) (the float 340))
|
||||
)
|
||||
(let ((v1-32 gp-0))
|
||||
(set! (-> v1-32 height) (the float 80))
|
||||
)
|
||||
(let ((v1-33 gp-0))
|
||||
(set! (-> v1-33 scale) 0.9)
|
||||
)
|
||||
(set-width! gp-0 340)
|
||||
(set-height! gp-0 80)
|
||||
(set-scale! gp-0 0.9)
|
||||
(set! (-> gp-0 flags) (font-flags shadow kerning large))
|
||||
(print-game-text
|
||||
(lookup-text! *common-text* (text-id press-triangle-to-use) #f)
|
||||
|
||||
+7
-12
@@ -745,12 +745,12 @@
|
||||
)
|
||||
(send-event (handle->process (-> self control unknown-combo-tracker00 target)) 'combo)
|
||||
)
|
||||
(let* ((s5-0 (handle->process (-> self control unknown-combo-tracker00 target)))
|
||||
(gp-0 (if (type? s5-0 process-focusable)
|
||||
s5-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((gp-0 (the-as
|
||||
process
|
||||
(as-type (handle->process (-> self control unknown-combo-tracker00 target)) process-focusable)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((s5-1 (get-trans (the-as process-focusable gp-0) 3)))
|
||||
(when (and (< 2048.0 (vector-vector-distance (-> self control trans) s5-1))
|
||||
(or (and (= gp-0 (handle->process sv-56)) (not (time-elapsed? (the-as time-frame sv-64) (seconds 0.1))))
|
||||
@@ -1742,12 +1742,7 @@
|
||||
(set! sv-40 (fill-actor-list-for-sphere *actor-hash* sv-56 (-> sv-32 data) (-> sv-32 allocated-length)))
|
||||
(set! (-> sv-32 length) sv-40)
|
||||
(countdown (s5-0 sv-40)
|
||||
(let* ((s4-0 (-> sv-32 s5-0 process))
|
||||
(v1-53 (if (type? s4-0 process-focusable)
|
||||
s4-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-53 (the-as process-drawable (as-type (-> sv-32 s5-0 process) process-focusable))))
|
||||
(when (and v1-53 (logtest? (process-mask enemy guard vehicle) (-> v1-53 mask)))
|
||||
(set! (-> sv-60 sv-48) (process->handle v1-53))
|
||||
(set! sv-48 (+ sv-48 1))
|
||||
|
||||
+3
-7
@@ -1602,13 +1602,9 @@
|
||||
cfg-132
|
||||
:delay (nop!)
|
||||
)
|
||||
(let ((s5-0 (handle->process (-> self attack-info attacker))))
|
||||
(when (if (type? s5-0 water-vol)
|
||||
s5-0
|
||||
)
|
||||
(logior! (-> self state-flags) (state-flags sf14))
|
||||
(set! (-> self alt-cam-pos y) (+ 4096.0 (-> self water height)))
|
||||
)
|
||||
(when (the-as process (as-type (handle->process (-> self attack-info attacker)) water-vol))
|
||||
(logior! (-> self state-flags) (state-flags sf14))
|
||||
(set! (-> self alt-cam-pos y) (+ 4096.0 (-> self water height)))
|
||||
)
|
||||
(set! (-> self control mod-surface) *neutral-mods*)
|
||||
(let ((v1-63 arg0))
|
||||
|
||||
+1
-5
@@ -254,11 +254,7 @@
|
||||
(sv-704 matrix)
|
||||
)
|
||||
(set! sv-224 arg5)
|
||||
(let* ((s3-0 arg0)
|
||||
(s4-0 (if (type? s3-0 process-focusable)
|
||||
s3-0
|
||||
)
|
||||
)
|
||||
(let* ((s4-0 (the-as process (as-type arg0 process-focusable)))
|
||||
(s3-1 (and s4-0 (focus-test? (the-as process-focusable s4-0) dead hit)))
|
||||
)
|
||||
(set! sv-96
|
||||
|
||||
+6
-15
@@ -1111,12 +1111,7 @@
|
||||
(go-virtual slide-control-watch)
|
||||
)
|
||||
(('update)
|
||||
(let* ((s4-0 proc)
|
||||
(gp-0 (if (type? s4-0 process-drawable)
|
||||
s4-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((gp-0 (the-as process (as-type proc process-drawable))))
|
||||
(if gp-0
|
||||
(find-target-point (-> (the-as process-drawable gp-0) root trans))
|
||||
)
|
||||
@@ -1142,15 +1137,11 @@
|
||||
(process-entity-status! self (entity-perm-status no-kill) #f)
|
||||
)
|
||||
:trans (behavior ()
|
||||
(let ((gp-0 (handle->process (-> self target))))
|
||||
(cond
|
||||
((if (type? gp-0 process-drawable)
|
||||
gp-0
|
||||
)
|
||||
)
|
||||
(else
|
||||
(go-virtual slide-control-watch)
|
||||
)
|
||||
(cond
|
||||
((the-as process (as-type (handle->process (-> self target)) process-drawable))
|
||||
)
|
||||
(else
|
||||
(go-virtual slide-control-watch)
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
+1
-6
@@ -214,12 +214,7 @@
|
||||
:event (behavior ((proc process) (argc int) (message symbol) (block event-message-block))
|
||||
(case message
|
||||
(('touched)
|
||||
(let* ((toucher-proc proc)
|
||||
(toucher (if (type? toucher-proc process-drawable)
|
||||
(the-as process-drawable toucher-proc)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((toucher (as-type proc process-drawable)))
|
||||
(when toucher
|
||||
(-> toucher root)
|
||||
(send-event
|
||||
|
||||
+12
-44
@@ -1112,15 +1112,9 @@
|
||||
(new 'stack 'font-context *font-default-matrix* 32 320 0.0 (font-color default) (font-flags shadow kerning))
|
||||
)
|
||||
)
|
||||
(let ((v1-21 gp-1))
|
||||
(set! (-> v1-21 width) (the float 340))
|
||||
)
|
||||
(let ((v1-22 gp-1))
|
||||
(set! (-> v1-22 height) (the float 80))
|
||||
)
|
||||
(let ((v1-23 gp-1))
|
||||
(set! (-> v1-23 scale) 0.9)
|
||||
)
|
||||
(set-width! gp-1 340)
|
||||
(set-height! gp-1 80)
|
||||
(set-scale! gp-1 0.9)
|
||||
(set! (-> gp-1 flags) (font-flags shadow kerning large))
|
||||
(print-game-text
|
||||
(lookup-text! *common-text* (text-id press-triangle-to-use) #f)
|
||||
@@ -1259,14 +1253,10 @@
|
||||
#f
|
||||
)
|
||||
(('touch 'attack)
|
||||
(let* ((gp-0 (-> block param 0))
|
||||
(s5-0 (the-as object (-> block param 1)))
|
||||
(s4-0 proc)
|
||||
(v1-21 (if (type? s4-0 projectile)
|
||||
s4-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((gp-0 (-> block param 0))
|
||||
(s5-0 (the-as object (-> block param 1)))
|
||||
(v1-21 (the-as object (as-type proc projectile)))
|
||||
)
|
||||
(when (and gp-0 v1-21)
|
||||
(case (-> (the-as attack-info s5-0) mode)
|
||||
(('wasp-shot 'guard-shot)
|
||||
@@ -1755,19 +1745,9 @@
|
||||
(set! (-> a1-0 quad) (-> a0-1 quad))
|
||||
(set! (-> a1-0 w) 409600.0)
|
||||
(countdown (s3-0 (fill-actor-list-for-sphere *actor-hash* (the-as sphere a1-0) s5-0 32))
|
||||
(let* ((s2-0 (-> s5-0 s3-0))
|
||||
(a0-5 (if (type? s2-0 collide-shape)
|
||||
s2-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((a0-5 (as-type (-> s5-0 s3-0) collide-shape)))
|
||||
(when a0-5
|
||||
(let* ((s1-0 (-> a0-5 process))
|
||||
(s2-1 (if (type? s1-0 process-focusable)
|
||||
s1-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((s2-1 (the-as process-drawable (as-type (-> a0-5 process) process-focusable))))
|
||||
(when (and s2-1
|
||||
(logtest? (process-mask enemy) (-> s2-1 mask))
|
||||
(logtest? (process-mask collectable) (-> s2-1 mask))
|
||||
@@ -2342,9 +2322,7 @@
|
||||
(the-as attack-info gp-0)
|
||||
(-> block param 1)
|
||||
self
|
||||
(if (type? proc process-drawable)
|
||||
proc
|
||||
)
|
||||
(the-as process (as-type proc process-drawable))
|
||||
(the-as touching-shapes-entry (-> block param 0))
|
||||
)
|
||||
(case (-> (the-as attack-info gp-0) mode)
|
||||
@@ -2497,12 +2475,7 @@
|
||||
(set! (-> self control unknown-vector38 quad) (-> self control trans quad))
|
||||
(set! (-> self control unknown-vector39 quad) (-> self control quat quad))
|
||||
(set! (-> self control unknown-vector40 quad) (-> self control quat quad))
|
||||
(let* ((s4-0 (handle->process arg0))
|
||||
(s5-0 (if (type? s4-0 process-drawable)
|
||||
s4-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((s5-0 (the-as process (as-type (handle->process arg0) process-drawable))))
|
||||
(when s5-0
|
||||
(vector-matrix*!
|
||||
(-> self control unknown-vector38)
|
||||
@@ -2517,12 +2490,7 @@
|
||||
(until (ja-done? 0)
|
||||
(let ((f30-0 (sin (lerp-scale 0.0 16384.0 (ja-aframe-num 0) 0.0 12.0))))
|
||||
(let ((f28-0 (lerp-scale 0.0 1.0 (ja-aframe-num 0) 0.0 12.0)))
|
||||
(let* ((s5-3 (handle->process arg0))
|
||||
(a0-39 (if (type? s5-3 process-drawable)
|
||||
s5-3
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((a0-39 (the-as process (as-type (handle->process arg0) process-drawable))))
|
||||
(if a0-39
|
||||
(set! (-> self alt-cam-pos quad) (-> (the-as process-focusable a0-39) root trans quad))
|
||||
)
|
||||
|
||||
+4
-22
@@ -1657,16 +1657,8 @@
|
||||
(vf2 :class vf)
|
||||
)
|
||||
(init-vf0-vector)
|
||||
(let ((s5-0 (if (type? arg1 process-drawable)
|
||||
arg1
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-0 (if (type? arg2 process-drawable)
|
||||
arg2
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((s5-0 (as-type arg1 process-drawable)))
|
||||
(let ((v1-0 (as-type arg2 process-drawable)))
|
||||
(cond
|
||||
((logtest? (attack-mask attacker-velocity) (-> this mask))
|
||||
(set! (-> arg0 attacker-velocity quad) (-> this attacker-velocity quad))
|
||||
@@ -1809,12 +1801,7 @@
|
||||
)
|
||||
(cond
|
||||
((not (logtest? s4-0 (attack-mask vector)))
|
||||
(let* ((s2-0 (handle->process (-> this attacker)))
|
||||
(v1-65 (if (type? s2-0 process-drawable)
|
||||
s2-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-65 (the-as process (as-type (handle->process (-> this attacker)) process-drawable))))
|
||||
(when (and v1-65 (nonzero? (-> (the-as process-drawable v1-65) root)))
|
||||
(set! (-> this trans quad) (-> (the-as process-drawable v1-65) root trans quad))
|
||||
(vector-! (-> this vector) (-> arg1 root trans) (-> (the-as process-drawable v1-65) root trans))
|
||||
@@ -1823,12 +1810,7 @@
|
||||
)
|
||||
)
|
||||
(else
|
||||
(let* ((s3-1 (handle->process (-> this attacker)))
|
||||
(v1-72 (if (type? s3-1 process-drawable)
|
||||
s3-1
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-72 (the-as process (as-type (handle->process (-> this attacker)) process-drawable))))
|
||||
(if (and v1-72 (nonzero? (-> (the-as process-drawable v1-72) root)))
|
||||
(set! (-> this trans quad) (-> (the-as process-drawable v1-72) root trans quad))
|
||||
)
|
||||
|
||||
+2
-11
@@ -2241,18 +2241,9 @@
|
||||
(set-time! (-> self control sliding-start-time))
|
||||
(set-time! (-> self gun combo-window-start))
|
||||
(set! (-> self gun combo-window-state) (-> self state name))
|
||||
(let ((v1-13 (if (type? proc process-focusable)
|
||||
proc
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-13 (the-as process (as-type proc process-focusable))))
|
||||
(when v1-13
|
||||
(let* ((s5-1 (-> (the-as target v1-13) control))
|
||||
(v1-14 (if (type? s5-1 collide-shape)
|
||||
s5-1
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-14 (the-as control-info (as-type (-> (the-as target v1-13) control) collide-shape))))
|
||||
(if (and v1-14 (or (logtest? (-> v1-14 root-prim prim-core collide-as) (collide-spec enemy))
|
||||
(logtest? (-> v1-14 root-prim prim-core action) (collide-action no-smack))
|
||||
)
|
||||
|
||||
+7
-13
@@ -339,12 +339,7 @@
|
||||
(init-vf0-vector)
|
||||
(cond
|
||||
((= (-> arg1 position) #t)
|
||||
(let* ((s3-0 (handle->process (-> arg1 handle)))
|
||||
(v1-4 (if (type? s3-0 process-drawable)
|
||||
(the-as process-drawable s3-0)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-4 (as-type (handle->process (-> arg1 handle)) process-drawable)))
|
||||
(if (and v1-4 (nonzero? (-> v1-4 root)))
|
||||
(set! (-> arg1 last-world-pos quad) (-> v1-4 root trans quad))
|
||||
)
|
||||
@@ -354,13 +349,12 @@
|
||||
(= (-> (the-as basic (-> arg1 position)) type) entity-actor)
|
||||
)
|
||||
(let* ((v1-14 (the-as entity-actor (-> arg1 position)))
|
||||
(s3-1 (if v1-14
|
||||
(-> v1-14 extra process)
|
||||
)
|
||||
)
|
||||
(a0-13 (if (type? s3-1 process-drawable)
|
||||
(the-as process-drawable s3-1)
|
||||
)
|
||||
(a0-13 (as-type
|
||||
(if v1-14
|
||||
(-> v1-14 extra process)
|
||||
)
|
||||
process-drawable
|
||||
)
|
||||
)
|
||||
)
|
||||
(if a0-13
|
||||
|
||||
+20
-50
@@ -945,12 +945,7 @@
|
||||
)
|
||||
(set! s3-0 (cond
|
||||
((= s2-0 #t)
|
||||
(let* ((s2-1 (handle->process (-> v1-9 handle)))
|
||||
(v1-13 (if (type? s2-1 process-drawable)
|
||||
s2-1
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-13 (the-as process (as-type (handle->process (-> v1-9 handle)) process-drawable))))
|
||||
(if v1-13
|
||||
(set! s3-0 (-> (the-as process-drawable v1-13) root trans))
|
||||
)
|
||||
@@ -959,13 +954,13 @@
|
||||
)
|
||||
((and (= (logand (the-as int s2-0) 7) 4) (= (-> (the-as basic s2-0) type) entity-actor))
|
||||
(let* ((v1-19 s2-0)
|
||||
(s3-1 (if v1-19
|
||||
(-> (the-as entity-actor v1-19) extra process)
|
||||
)
|
||||
)
|
||||
(v1-21 (if (type? s3-1 process-drawable)
|
||||
s3-1
|
||||
)
|
||||
(v1-21 (the-as process (as-type
|
||||
(if v1-19
|
||||
(-> (the-as entity-actor v1-19) extra process)
|
||||
)
|
||||
process-drawable
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
(if v1-21
|
||||
@@ -1425,12 +1420,7 @@
|
||||
(sv-224 matrix)
|
||||
(sv-228 matrix)
|
||||
)
|
||||
(let ((s3-0 (handle->process (-> arg1 handle))))
|
||||
(set! sv-16 (if (type? s3-0 process-drawable)
|
||||
s3-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(set! sv-16 (the-as process (as-type (handle->process (-> arg1 handle)) process-drawable)))
|
||||
(set! sv-20 (-> arg0 buf))
|
||||
(when (and sv-16 (nonzero? (-> (the-as process-drawable sv-16) root)))
|
||||
(set! sv-208 (-> sv-20 base))
|
||||
@@ -1551,12 +1541,7 @@
|
||||
(sv-136 vector)
|
||||
(sv-140 matrix)
|
||||
)
|
||||
(let ((s0-0 (handle->process (-> arg1 handle))))
|
||||
(set! sv-16 (if (type? s0-0 process-drawable)
|
||||
s0-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(set! sv-16 (the-as process (as-type (handle->process (-> arg1 handle)) process-drawable)))
|
||||
(set! sv-20 (-> *video-params* relative-x-scale))
|
||||
(set! sv-24 (-> arg0 buf))
|
||||
(when (and sv-16 (nonzero? (-> (the-as process-drawable sv-16) root)))
|
||||
@@ -1684,12 +1669,7 @@
|
||||
(vf4 :class vf)
|
||||
(vf5 :class vf)
|
||||
)
|
||||
(let ((s3-0 (handle->process (-> arg1 handle))))
|
||||
(set! sv-16 (if (type? s3-0 process-drawable)
|
||||
s3-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(set! sv-16 (the-as process (as-type (handle->process (-> arg1 handle)) process-drawable)))
|
||||
(set! sv-20 (-> arg0 buf))
|
||||
(when (and sv-16 (nonzero? (-> (the-as process-drawable sv-16) root)))
|
||||
(set! sv-208 (-> sv-20 base))
|
||||
@@ -1835,12 +1815,7 @@
|
||||
(sv-228 matrix)
|
||||
(sv-232 matrix)
|
||||
)
|
||||
(let ((s3-0 (handle->process (-> arg1 handle))))
|
||||
(set! sv-16 (if (type? s3-0 process-drawable)
|
||||
s3-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(set! sv-16 (the-as process (as-type (handle->process (-> arg1 handle)) process-drawable)))
|
||||
(set! sv-20 (-> arg0 buf))
|
||||
(when (and sv-16 (nonzero? (-> (the-as process-drawable sv-16) root)))
|
||||
(set! sv-208 (-> sv-20 base))
|
||||
@@ -2313,12 +2288,7 @@
|
||||
(let ((s1-0 (target-pos 0)))
|
||||
(cond
|
||||
((= (-> arg1 position) #t)
|
||||
(let* ((s3-0 (handle->process (-> arg1 handle)))
|
||||
(v1-4 (if (type? s3-0 process-drawable)
|
||||
s3-0
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-4 (the-as process (as-type (handle->process (-> arg1 handle)) process-drawable))))
|
||||
(when (and v1-4 (nonzero? (-> (the-as process-drawable v1-4) root)))
|
||||
(set! (-> arg1 last-world-pos quad) (-> (the-as process-drawable v1-4) root trans quad))
|
||||
(vector-! (-> arg1 last-relative-pos) s1-0 (-> arg1 last-world-pos))
|
||||
@@ -2329,13 +2299,13 @@
|
||||
(= (-> (the-as basic (-> arg1 position)) type) entity-actor)
|
||||
)
|
||||
(let* ((v1-15 (-> arg1 position))
|
||||
(s3-1 (if v1-15
|
||||
(-> (the-as entity-actor v1-15) extra process)
|
||||
)
|
||||
)
|
||||
(a0-16 (if (type? s3-1 process-drawable)
|
||||
s3-1
|
||||
)
|
||||
(a0-16 (the-as process (as-type
|
||||
(if v1-15
|
||||
(-> (the-as entity-actor v1-15) extra process)
|
||||
)
|
||||
process-drawable
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
(cond
|
||||
|
||||
+207
-571
File diff suppressed because it is too large
Load Diff
+3
-9
@@ -1424,17 +1424,11 @@
|
||||
(+! s5-0 20)
|
||||
)
|
||||
(dotimes (s4-1 (length gp-0))
|
||||
(let ((v1-24 sv-144))
|
||||
(set! (-> v1-24 scale) 0.5)
|
||||
)
|
||||
(set-scale! sv-144 0.5)
|
||||
(set! (-> sv-144 origin x) 79.0)
|
||||
(set! (-> sv-144 origin y) (the float sv-148))
|
||||
(let ((v1-29 sv-144))
|
||||
(set! (-> v1-29 width) (the float 355))
|
||||
)
|
||||
(let ((v1-30 sv-144))
|
||||
(set! (-> v1-30 height) (the float 30))
|
||||
)
|
||||
(set-width! sv-144 355)
|
||||
(set-height! sv-144 30)
|
||||
(set! (-> sv-144 flags) (if (= (-> *setting-control* user-default language) (language-enum japanese))
|
||||
(font-flags middle middle-vert large)
|
||||
(font-flags kerning middle middle-vert large)
|
||||
|
||||
+1
-3
@@ -405,9 +405,7 @@
|
||||
(if (logtest? (-> arg2 flags) (font-flags middle-vert))
|
||||
(+! (-> arg2 origin y) (* 0.5 (- f30-0 f1-2)))
|
||||
)
|
||||
(let ((v1-10 arg2))
|
||||
(set! (-> v1-10 scale) (* f28-0 arg1))
|
||||
)
|
||||
(set-scale! arg2 (* f28-0 arg1))
|
||||
(set! (-> arg2 width) f0-1)
|
||||
(set! (-> arg2 height) f1-2)
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user