mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-06-04 02:47:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

[decompiler] as-type and font method support (#3855)

Browse Source 
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.


![image](https://github.com/user-attachments/assets/5c31bf85-97b4-437c-bc4b-dc054e60551e)

---------

Co-authored-by: water111 <awaterford1111445@gmail.com>
This commit is contained in:
water111
2025-02-01 21:23:11 -05:00
committed by GitHub
parent d5590ab638
commit 48cb9bb787
645 changed files with 5391 additions and 16694 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/decompiler/reference/jak1/decompiler-macros.gc
Generated Vendored
+13
View File
@@ -1717,5 +1717,18 @@
(defmacro get-texture (name tpage)
`(lookup-texture-by-id ,(string->symbol-format "{}-{}" name tpage)))
(defmacro as-type (this type)
"If this is the specified type, return this cast to that type. Otherwise, return #f."
(with-gensyms (obj)
`(the ,type (let ((,obj ,this))
(if (type? ,obj ,type)
,obj
)
)
)
)
)
(import "goal_src/jak1/engine/data/tpages.gc")
(import "goal_src/jak1/engine/data/textures.gc")
test/decompiler/reference/jak1/engine/common-obs/process-taskable_REF.gc
Generated Vendored
+6 -18
View File
@@ -50,15 +50,9 @@
)
)
)
(let ((v1-4 a1-2))
(set! (-> v1-4 width) (the float (- 512 (-> this x-position))))
)
(let ((v1-5 a1-2))
(set! (-> v1-5 height) (the float 40))
)
(let ((v1-6 a1-2))
(set! (-> v1-6 scale) 0.9)
)
(set-width! a1-2 (- 512 (-> this x-position)))
(set-height! a1-2 40)
(set-scale! a1-2 0.9)
(set! (-> a1-2 flags) (font-flags shadow kerning middle-vert large))
(print-game-text (-> this message) a1-2 #f 128 22)
)
@@ -929,15 +923,9 @@
(new 'stack 'font-context *font-default-matrix* 32 140 0.0 (font-color default) (font-flags shadow kerning))
)
)
(let ((v1-57 gp-1))
(set! (-> v1-57 width) (the float 440))
)
(let ((v1-58 gp-1))
(set! (-> v1-58 height) (the float 60))
)
(let ((v1-59 gp-1))
(set! (-> v1-59 scale) 0.9)
)
(set-width! gp-1 440)
(set-height! gp-1 60)
(set-scale! gp-1 0.9)
(set! (-> gp-1 flags) (font-flags shadow kerning middle-vert large))
(print-game-text (lookup-text! *common-text* (-> self talk-message) #f) gp-1 #f 128 22)
)
test/decompiler/reference/jak1/engine/debug/anim-tester_REF.gc
Generated Vendored
+4 -6
View File
@@ -1814,12 +1814,10 @@
(s4-1 (the-as anim-test-sequence (-> s2-2 base)))
)
(when (not (logtest? (-> (the-as anim-test-seq-item gp-0) flags) 1))
(let ((v1-57 s3-0)
(a1-13 (+ (-> arg1 xpos) (* (-> *ANIM_TESTER-bank* EDIT_STATS_X) (-> *DISP_LIST-bank* CHAR_WIDTH))))
(a0-29 (-> arg1 ypos))
)
(set! (-> v1-57 origin x) (the float a1-13))
(set! (-> v1-57 origin y) (the float a0-29))
(set-origin!
s3-0
(+ (-> arg1 xpos) (* (-> *ANIM_TESTER-bank* EDIT_STATS_X) (-> *DISP_LIST-bank* CHAR_WIDTH)))
(-> arg1 ypos)
)
(cond
((and (< (-> (the-as anim-test-seq-item gp-0) speed) 0) (< -100 (-> (the-as anim-test-seq-item gp-0) speed)))
test/decompiler/reference/jak1/engine/debug/menu_REF.gc
Generated Vendored
+2 -14
View File
@@ -1001,13 +1001,7 @@
(draw-string "..." s1-0 s5-0)
(set! arg4 (and (zero? arg3) arg4))
(when arg4
(let ((v1-12 s5-0)
(a1-5 20)
(a0-10 204)
)
(set! (-> v1-12 origin x) (the float a1-5))
(set! (-> v1-12 origin y) (the float a0-10))
)
(set-origin! s5-0 20 204)
(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)
@@ -1115,13 +1109,7 @@
(font-color menu)
)
)
(let ((v1-16 (-> arg0 context font))
(a1-5 s3-1)
(a0-18 s2-1)
)
(set! (-> v1-16 origin x) (the float a1-5))
(set! (-> v1-16 origin y) (the float a0-18))
)
(set-origin! (-> arg0 context font) s3-1 s2-1)
(set! sv-16 (-> *display* frames (-> *display* on-screen) frame debug-buf))
(set! sv-32 (-> sv-16 base))
(draw-string ">" sv-16 (-> arg0 context font))
test/decompiler/reference/jak1/engine/entity/ambient_REF.gc
Generated Vendored
+6 -18
View File
@@ -382,12 +382,8 @@
(new 'stack 'font-context *font-default-matrix* 56 160 0.0 (font-color default) (font-flags shadow kerning))
)
)
(let ((v1-3 s5-0))
(set! (-> v1-3 width) (the float 400))
)
(let ((v1-4 s5-0))
(set! (-> v1-4 height) (the float 96))
)
(set-width! s5-0 400)
(set-height! s5-0 96)
(set! (-> s5-0 flags) (font-flags shadow kerning middle large))
(print-game-text (lookup-text! *common-text* (-> this text-id-to-display) #f) s5-0 #f 128 22)
)
@@ -602,12 +598,8 @@
(new 'stack 'font-context *font-default-matrix* 56 160 0.0 (font-color default) (font-flags shadow kerning))
)
)
(let ((v1-7 s3-0))
(set! (-> v1-7 width) (the float 400))
)
(let ((v1-8 s3-0))
(set! (-> v1-8 height) (the float 96))
)
(set-width! s3-0 400)
(set-height! s3-0 96)
(set! (-> s3-0 flags) (font-flags shadow kerning middle))
(let ((s2-0 print-game-text))
(format (clear *temp-string*) "~S~S" arg0 arg1)
@@ -675,12 +667,8 @@
(new 'stack 'font-context *font-default-matrix* 56 160 0.0 (font-color default) (font-flags shadow kerning))
)
)
(let ((v1-5 a1-3))
(set! (-> v1-5 width) (the float 400))
)
(let ((v1-6 a1-3))
(set! (-> v1-6 height) (the float 96))
)
(set-width! a1-3 400)
(set-height! a1-3 96)
(set! (-> a1-3 flags) (font-flags shadow kerning middle large))
(print-game-text "AS: UNKNOWN ID" a1-3 #f 128 22)
)
test/decompiler/reference/jak1/engine/game/game-save_REF.gc
Generated Vendored
+7 -21
View File
@@ -1248,12 +1248,8 @@
(new 'stack 'font-context *font-default-matrix* 32 160 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 128 22)
@@ -1264,26 +1260,16 @@
(new 'stack 'font-context *font-default-matrix* 20 40 0.0 (font-color default) (font-flags shadow kerning))
)
)
(let ((v1-15 gp-1))
(set! (-> v1-15 scale) 0.8)
)
(let ((v1-16 gp-1))
(set! (-> v1-16 width) (the float 472))
)
(let ((v1-17 gp-1))
(set! (-> v1-17 height) (the float 20))
)
(set-scale! gp-1 0.8)
(set-width! gp-1 472)
(set-height! gp-1 20)
(set! (-> gp-1 flags) (font-flags shadow kerning middle middle-vert large))
(when (zero? (-> *game-info* auto-save-count))
(print-game-text (lookup-text! *common-text* (text-id saving-data) #f) gp-1 #f 128 22)
(set! (-> gp-1 origin x) 20.0)
(set! (-> gp-1 origin y) 130.0)
(let ((v1-23 gp-1))
(set! (-> v1-23 scale) 0.7)
)
(let ((v1-24 gp-1))
(set! (-> v1-24 height) (the float 40))
)
(set-scale! gp-1 0.7)
(set-height! gp-1 40)
(let ((s5-2 print-game-text))
((the-as (function object string object none) format)
(clear *temp-string*)
test/decompiler/reference/jak1/engine/gfx/font-h_REF.gc
Generated Vendored
+3 -9
View File
@@ -187,12 +187,8 @@
(let ((v1-6 this))
(set! (-> v1-6 origin w) 1.0)
)
(let ((v1-7 this))
(set! (-> v1-7 width) (the float 512))
)
(let ((v1-8 this))
(set! (-> v1-8 height) (the float 256))
)
(set-width! this 512)
(set-height! this 256)
(let ((v1-9 this))
(set! (-> v1-9 projection) 1.0)
)
@@ -201,9 +197,7 @@
(let ((a0-4 this))
(set! (-> a0-4 start-line) (the-as uint 0))
)
(let ((v1-13 this))
(set! (-> v1-13 scale) 1.0)
)
(set-scale! this 1.0)
this
)
)
test/decompiler/reference/jak1/engine/ui/credits_REF.gc
Generated Vendored
+6 -18
View File
@@ -47,12 +47,8 @@
)
)
1.0
(let ((v1-3 gp-0))
(set! (-> v1-3 width) (the float 600))
)
(let ((v1-4 gp-0))
(set! (-> v1-4 height) (the float 10))
)
(set-width! gp-0 600)
(set-height! gp-0 10)
(set! (-> gp-0 flags) (font-flags kerning middle large))
(let* ((s5-1 (- s5-0 (mod s5-0 3)))
(f0-10 (- f30-0 (the float s5-1)))
@@ -91,9 +87,7 @@
)
)
(when s3-0
(let ((v1-25 gp-0))
(set! (-> v1-25 scale) (-> *title-credits-scale* (+ s5-1 s4-1)))
)
(set-scale! gp-0 (-> *title-credits-scale* (+ s5-1 s4-1)))
(print-game-text s3-0 gp-0 #f (the int f30-1) 22)
)
)
@@ -119,15 +113,9 @@
(new 'stack 'font-context *font-default-matrix* 31 0 0.0 (font-color default) (font-flags shadow kerning))
)
)
(let ((v1-2 s5-0))
(set! (-> v1-2 width) (the float 450))
)
(let ((v1-3 s5-0))
(set! (-> v1-3 height) (the float 10))
)
(let ((v1-4 s5-0))
(set! (-> v1-4 scale) 1.0)
)
(set-width! s5-0 450)
(set-height! s5-0 10)
(set-scale! s5-0 1.0)
(set! (-> s5-0 flags) (font-flags shadow kerning middle large))
(while (or s2-0 (and (< s4-0 (- s3-0)) (< (the-as uint gp-0) (the-as uint 3249))))
(+! s4-0 s3-0)
test/decompiler/reference/jak1/engine/ui/hud-classes_REF.gc
Generated Vendored
+3 -9
View File
@@ -538,15 +538,9 @@
)
)
)
(let ((v1-12 s5-1))
(set! (-> v1-12 width) (the float 228))
)
(let ((v1-13 s5-1))
(set! (-> v1-13 height) (the float 45))
)
(let ((v1-14 s5-1))
(set! (-> v1-14 scale) 0.6)
)
(set-width! s5-1 228)
(set-height! s5-1 45)
(set-scale! s5-1 0.6)
(set! (-> s5-1 flags) (font-flags shadow kerning middle middle-vert large))
(print-game-text
(lookup-text! *common-text* (-> *level-task-data* (-> this level-index) level-name-id) #f)
test/decompiler/reference/jak1/engine/ui/progress/progress-draw_REF.gc
Generated Vendored
+132 -396
View File
@@ -141,15 +141,9 @@
)
)
)
(let ((v1-91 s0-1))
(set! (-> v1-91 width) (the float 328))
)
(let ((v1-92 s0-1))
(set! (-> v1-92 height) (the float 50))
)
(let ((v1-93 s0-1))
(set! (-> v1-93 scale) 0.7)
)
(set-width! s0-1 328)
(set-height! s0-1 50)
(set-scale! s0-1 0.7)
(set! (-> s0-1 flags) (font-flags shadow kerning middle middle-vert large))
(set! sv-224 print-game-text-scaled)
(let ((a0-47 (lookup-text! *common-text* (-> s5-0 task-info (-> this task-index) task-name s1-0) #f))
@@ -165,12 +159,8 @@
(let ((a0-49 s0-1))
(set! (-> a0-49 color) (font-color progress-blue))
)
(let ((v1-104 s0-1))
(set! (-> v1-104 height) (the float 15))
)
(let ((v1-105 s0-1))
(set! (-> v1-105 scale) 0.5)
)
(set-height! s0-1 15)
(set-scale! s0-1 0.5)
(print-game-text-scaled
(lookup-text! *common-text* (text-id task-completed) #f)
f30-0
@@ -234,12 +224,8 @@
)
)
)
(let ((v1-19 s4-1))
(set! (-> v1-19 width) (the float 328))
)
(let ((v1-20 s4-1))
(set! (-> v1-20 height) (the float 70))
)
(set-width! s4-1 328)
(set-height! s4-1 70)
(set! (-> s4-1 flags) (font-flags shadow kerning large))
(let ((s3-1 print-game-text-scaled))
(format
@@ -250,9 +236,7 @@
)
(s3-1 *temp-string* f30-0 s4-1 (the int (* 128.0 f30-0)))
)
(let ((v1-26 s4-1))
(set! (-> v1-26 width) (the float 428))
)
(set-width! s4-1 428)
(+! (-> s4-1 origin x) -220.0)
(+! (-> s4-1 origin y) 40.0)
(set! (-> s4-1 flags) (font-flags shadow kerning middle large))
@@ -318,20 +302,14 @@
)
)
)
(let ((v1-9 s4-1))
(set! (-> v1-9 width) (the float 328))
)
(let ((v1-10 s4-1))
(set! (-> v1-10 height) (the float 70))
)
(set-width! s4-1 328)
(set-height! s4-1 70)
(set! (-> s4-1 flags) (font-flags shadow kerning large))
(let ((s3-1 print-game-text-scaled))
(format (clear *temp-string*) "~D/~D" s2-0 (-> *game-counts* data arg0 buzzer-count))
(s3-1 *temp-string* f30-0 s4-1 (the int (* 128.0 f30-0)))
)
(let ((v1-14 s4-1))
(set! (-> v1-14 width) (the float 428))
)
(set-width! s4-1 428)
(+! (-> s4-1 origin x) -220.0)
(+! (-> s4-1 origin y) 40.0)
(set! (-> s4-1 flags) (font-flags shadow kerning middle large))
@@ -356,15 +334,9 @@
;; definition for method 35 of type progress
;; INFO: Return type mismatch int vs none.
(defmethod draw-memcard-storage-error ((this progress) (arg0 font-context))
(let ((v1-0 arg0))
(set! (-> v1-0 scale) 0.55)
)
(let ((v1-1 arg0))
(set! (-> v1-1 width) (the float 265))
)
(let ((v1-2 arg0))
(set! (-> v1-2 height) (the float 55))
)
(set-scale! arg0 0.55)
(set-width! arg0 265)
(set-height! arg0 55)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(let ((s4-0 (text-id memcard-not-formatted-title)))
(case (-> this display-state)
@@ -382,12 +354,8 @@
)
(set! (-> arg0 origin x) (the float (- 20 (-> this left-x-offset))))
(set! (-> arg0 origin y) 70.0)
(let ((v1-12 arg0))
(set! (-> v1-12 width) (the float 350))
)
(let ((v1-13 arg0))
(set! (-> v1-13 height) (the float 40))
)
(set-width! arg0 350)
(set-height! arg0 40)
(let ((s4-1 print-game-text-scaled))
(format
(clear *temp-string*)
@@ -400,18 +368,14 @@
(s4-1 *temp-string* (-> this transition-percentage-invert) arg0 128)
)
(set! (-> arg0 origin y) 115.0)
(let ((v1-17 arg0))
(set! (-> v1-17 height) (the float 60))
)
(set-height! arg0 60)
(print-game-text-scaled
(lookup-text! *common-text* (text-id memcard-space-requirement2) #f)
(-> this transition-percentage-invert)
arg0
128
)
(let ((v1-19 arg0))
(set! (-> v1-19 scale) 0.65)
)
(set-scale! arg0 0.65)
(set! (-> arg0 origin y) 160.0)
(print-game-text-scaled
(lookup-text! *common-text* (text-id continue?) #f)
@@ -427,15 +391,9 @@
;; INFO: Return type mismatch int vs none.
(defmethod draw-memcard-format ((this progress) (arg0 font-context))
(set! (-> arg0 origin y) 35.0)
(let ((v1-0 arg0))
(set! (-> v1-0 scale) 0.55)
)
(let ((v1-1 arg0))
(set! (-> v1-1 width) (the float 265))
)
(let ((v1-2 arg0))
(set! (-> v1-2 height) (the float 55))
)
(set-scale! arg0 0.55)
(set-width! arg0 265)
(set-height! arg0 55)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(let ((s4-0 print-game-text-scaled))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id memcard-not-formatted-title) #f) 1)
@@ -443,25 +401,17 @@
)
(set! (-> arg0 origin x) (the float (- 20 (-> this left-x-offset))))
(set! (-> arg0 origin y) 105.0)
(let ((v1-7 arg0))
(set! (-> v1-7 width) (the float 360))
)
(let ((v1-8 arg0))
(set! (-> v1-8 height) (the float 40))
)
(set-width! arg0 360)
(set-height! arg0 40)
(print-game-text-scaled
(lookup-text! *common-text* (text-id memcard-not-formatted-msg) #f)
(-> this transition-percentage-invert)
arg0
128
)
(let ((v1-10 arg0))
(set! (-> v1-10 scale) 0.65)
)
(set-scale! arg0 0.65)
(set! (-> arg0 origin y) 138.0)
(let ((v1-11 arg0))
(set! (-> v1-11 height) (the float 60))
)
(set-height! arg0 60)
(print-game-text-scaled
(lookup-text! *common-text* (text-id format?) #f)
(-> this transition-percentage-invert)
@@ -475,18 +425,12 @@
;; definition for method 36 of type progress
;; INFO: Return type mismatch int vs none.
(defmethod draw-memcard-data-exists ((this progress) (arg0 font-context))
(let ((v1-0 arg0))
(set! (-> v1-0 scale) 0.65)
)
(set-scale! arg0 0.65)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(set! (-> arg0 origin x) (the float (- 20 (-> this left-x-offset))))
(set! (-> arg0 origin y) 55.0)
(let ((v1-4 arg0))
(set! (-> v1-4 width) (the float 365))
)
(let ((v1-5 arg0))
(set! (-> v1-5 height) (the float 75))
)
(set-width! arg0 365)
(set-height! arg0 75)
(print-game-text-scaled
(lookup-text! *common-text* (text-id save-data-already-exists) #f)
(-> this transition-percentage-invert)
@@ -494,12 +438,8 @@
128
)
(set! (-> arg0 origin y) 140.0)
(let ((v1-7 arg0))
(set! (-> v1-7 width) (the float 360))
)
(let ((v1-8 arg0))
(set! (-> v1-8 height) (the float 40))
)
(set-width! arg0 360)
(set-height! arg0 40)
(print-game-text-scaled
(lookup-text! *common-text* (text-id overwrite?) #f)
(-> this transition-percentage-invert)
@@ -513,29 +453,19 @@
;; definition for method 37 of type progress
;; INFO: Return type mismatch int vs none.
(defmethod draw-memcard-no-data ((this progress) (arg0 font-context))
(let ((v1-0 arg0))
(set! (-> v1-0 scale) 0.65)
)
(set-scale! arg0 0.65)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(set! (-> arg0 origin x) (the float (- 20 (-> this left-x-offset))))
(set! (-> arg0 origin y) 40.0)
(let ((v1-4 arg0))
(set! (-> v1-4 width) (the float 365))
)
(let ((v1-5 arg0))
(set! (-> v1-5 height) (the float 75))
)
(set-width! arg0 365)
(set-height! arg0 75)
(let ((s4-0 print-game-text-scaled))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id no-save-data) #f) 1)
(s4-0 *temp-string* (-> this transition-percentage-invert) arg0 128)
)
(set! (-> arg0 origin y) 130.0)
(let ((v1-7 arg0))
(set! (-> v1-7 width) (the float 360))
)
(let ((v1-8 arg0))
(set! (-> v1-8 height) (the float 40))
)
(set-width! arg0 360)
(set-height! arg0 40)
(print-game-text-scaled
(lookup-text! *common-text* (text-id create-save-data?) #f)
(-> this transition-percentage-invert)
@@ -549,18 +479,12 @@
;; definition for method 38 of type progress
;; INFO: Return type mismatch int vs none.
(defmethod draw-memcard-accessing ((this progress) (arg0 font-context))
(let ((v1-0 arg0))
(set! (-> v1-0 scale) 1.0)
)
(set-scale! arg0 1.0)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(set! (-> arg0 origin x) (the float (- 20 (-> this left-x-offset))))
(set! (-> arg0 origin y) 35.0)
(let ((v1-4 arg0))
(set! (-> v1-4 width) (the float 365))
)
(let ((v1-5 arg0))
(set! (-> v1-5 height) (the float 75))
)
(set-width! arg0 365)
(set-height! arg0 75)
(when (or (< (mod (-> *display* real-frame-counter) 300) 150) (!= (-> this transition-percentage-invert) 1.0))
(let ((a1-1 (text-id loading-data)))
(case (-> this display-state)
@@ -577,18 +501,12 @@
(print-game-text-scaled (lookup-text! *common-text* a1-1 #f) (-> this transition-percentage-invert) arg0 128)
)
)
(let ((v1-18 arg0))
(set! (-> v1-18 scale) 0.65)
)
(set-scale! arg0 0.65)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(set! (-> arg0 origin x) (the float (- 15 (-> this left-x-offset))))
(set! (-> arg0 origin y) 100.0)
(let ((v1-22 arg0))
(set! (-> v1-22 width) (the float 370))
)
(let ((v1-23 arg0))
(set! (-> v1-23 height) (the float 75))
)
(set-width! arg0 370)
(set-height! arg0 75)
(let ((s4-1 print-game-text-scaled))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id memcard-do-not-remove) #f) 1)
(s4-1 *temp-string* (-> this transition-percentage-invert) arg0 128)
@@ -600,29 +518,19 @@
;; definition for method 39 of type progress
;; INFO: Return type mismatch int vs none.
(defmethod draw-memcard-insert ((this progress) (arg0 font-context))
(let ((v1-0 arg0))
(set! (-> v1-0 scale) 0.65)
)
(set-scale! arg0 0.65)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(set! (-> arg0 origin x) (the float (- 50 (-> this left-x-offset))))
(set! (-> arg0 origin y) 35.0)
(let ((v1-4 arg0))
(set! (-> v1-4 width) (the float 310))
)
(let ((v1-5 arg0))
(set! (-> v1-5 height) (the float 110))
)
(set-width! arg0 310)
(set-height! arg0 110)
(let ((s4-0 print-game-text-scaled))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id insert-memcard) #f) 1)
(s4-0 *temp-string* (-> this transition-percentage-invert) arg0 128)
)
(let ((v1-7 arg0))
(set! (-> v1-7 scale) 0.65)
)
(set-scale! arg0 0.65)
(set! (-> arg0 origin y) 130.0)
(let ((v1-8 arg0))
(set! (-> v1-8 height) (the float 60))
)
(set-height! arg0 60)
(print-game-text-scaled
(lookup-text! *common-text* (text-id back?) #f)
(-> this transition-percentage-invert)
@@ -676,18 +584,12 @@
(set! f0-13 0.0)
)
(let ((s4-1 (the int (* 128.0 f0-13))))
(let ((v1-29 arg0))
(set! (-> v1-29 scale) 0.5)
)
(set-scale! arg0 0.5)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(set! (-> arg0 origin x) (the float (- 102 (-> this left-x-offset))))
(set! (-> arg0 origin y) 5.0)
(let ((v1-33 arg0))
(set! (-> v1-33 width) (the float 200))
)
(let ((v1-34 arg0))
(set! (-> v1-34 height) (the float 20))
)
(set-width! arg0 200)
(set-height! arg0 20)
(print-game-text
(lookup-text!
*common-text*
@@ -703,9 +605,7 @@
22
)
(set! (-> arg0 origin y) 26.0)
(let ((v1-37 arg0))
(set! (-> v1-37 height) (the float 20))
)
(set-height! arg0 20)
(let ((s3-3 (-> this card-info))
(s2-0 23)
)
@@ -715,15 +615,11 @@
(let ((a0-17 arg0))
(set! (-> a0-17 color) (font-color default))
)
(let ((v1-42 arg0))
(set! (-> v1-42 width) (the float 320))
)
(set-width! arg0 320)
(cond
((and s3-3 (= (-> s3-3 formatted) 1) (= (-> s3-3 inited) 1) (= (-> s3-3 file s1-0 present) 1))
(set! (-> this particles s2-0 init-pos x) (the float (- 66 (-> this left-x-offset))))
(let ((v1-57 arg0))
(set! (-> v1-57 scale) 0.6)
)
(set-scale! arg0 0.6)
(if (and (< (-> s3-3 file s1-0 level-index) (length *level-task-data-remap*))
(> (-> s3-3 file s1-0 level-index) 0)
)
@@ -750,15 +646,11 @@
(-> this in-transition)
)
)
(let ((v1-87 arg0))
(set! (-> v1-87 scale) 0.5)
)
(set-scale! arg0 0.5)
(+! (-> arg0 origin y) 16.0)
(set! (-> arg0 flags) (font-flags shadow kerning middle large))
(set! (-> arg0 origin x) (the float (- -73 (-> this left-x-offset))))
(let ((v1-91 arg0))
(set! (-> v1-91 width) (the float 350))
)
(set-width! arg0 350)
(let ((s0-2 print-game-text))
(set! sv-16 format)
(let ((a0-40 (clear *temp-string*))
@@ -792,9 +684,7 @@
(s0-4 *temp-string* arg0 #f s4-1 22)
)
(+! (-> arg0 origin y) 1.0)
(let ((v1-108 arg0))
(set! (-> v1-108 scale) 1.0)
)
(set-scale! arg0 1.0)
(set! (-> arg0 flags) (font-flags shadow kerning right large))
(set! (-> arg0 origin x) (the float (- 352 (-> this left-x-offset))))
(let ((s0-5 print-game-text))
@@ -807,9 +697,7 @@
)
(s0-5 *temp-string* arg0 #f s4-1 22)
)
(let ((v1-116 arg0))
(set! (-> v1-116 scale) 0.5)
)
(set-scale! arg0 0.5)
(+! (-> arg0 origin y) 9.0)
(set! (-> arg0 flags) (font-flags shadow kerning large))
(set! (-> arg0 origin x) (the float (- 85 (-> this left-x-offset))))
@@ -854,13 +742,9 @@
(else
(+! (-> arg0 origin y) 18.0)
(set! (-> arg0 origin x) (the float (- 28 (-> this left-x-offset))))
(let ((v1-131 arg0))
(set! (-> v1-131 scale) 0.8)
)
(set-scale! arg0 0.8)
(set! (-> arg0 flags) (font-flags shadow kerning middle large))
(let ((v1-133 arg0))
(set! (-> v1-133 width) (the float 350))
)
(set-width! arg0 350)
(cond
((= (scf-get-territory) 1)
(let ((s0-10 print-game-text))
@@ -903,9 +787,7 @@
(else
(set! (-> this particles s2-0 init-pos x) -320.0)
(+! (-> arg0 origin y) 12.0)
(let ((v1-173 arg0))
(set! (-> v1-173 scale) 0.7)
)
(set-scale! arg0 0.7)
(print-game-text (lookup-text! *common-text* (text-id empty) #f) arg0 #f s4-1 22)
(+! (-> arg0 origin y) 29.0)
)
@@ -922,18 +804,12 @@
;; definition for method 41 of type progress
;; INFO: Return type mismatch int vs none.
(defmethod draw-memcard-auto-save-error ((this progress) (arg0 font-context))
(let ((v1-0 arg0))
(set! (-> v1-0 scale) 0.6)
)
(set-scale! arg0 0.6)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(set! (-> arg0 origin x) (the float (- 70 (-> this left-x-offset))))
(set! (-> arg0 origin y) 5.0)
(let ((v1-4 arg0))
(set! (-> v1-4 width) (the float 265))
)
(let ((v1-5 arg0))
(set! (-> v1-5 height) (the float 35))
)
(set-width! arg0 265)
(set-height! arg0 35)
(print-game-text-scaled
(lookup-text! *common-text* (text-id error-saving) #f)
(-> this transition-percentage-invert)
@@ -942,23 +818,15 @@
)
(set! (-> arg0 origin x) (the float (- 20 (-> this left-x-offset))))
(set! (-> arg0 origin y) 34.0)
(let ((v1-9 arg0))
(set! (-> v1-9 width) (the float 360))
)
(let ((v1-10 arg0))
(set! (-> v1-10 height) (the float 50))
)
(set-width! arg0 360)
(set-height! arg0 50)
(let ((s4-1 print-game-text-scaled))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id check-memcard) #f) 1)
(s4-1 *temp-string* (-> this transition-percentage-invert) arg0 128)
)
(set! (-> arg0 origin y) 89.0)
(let ((v1-12 arg0))
(set! (-> v1-12 width) (the float 360))
)
(let ((v1-13 arg0))
(set! (-> v1-13 height) (the float 20))
)
(set-width! arg0 360)
(set-height! arg0 20)
(print-game-text-scaled
(lookup-text! *common-text* (text-id autosave-disabled-title) #f)
(-> this transition-percentage-invert)
@@ -966,25 +834,17 @@
128
)
(set! (-> arg0 origin y) 118.0)
(let ((v1-15 arg0))
(set! (-> v1-15 width) (the float 360))
)
(let ((v1-16 arg0))
(set! (-> v1-16 height) (the float 60))
)
(set-width! arg0 360)
(set-height! arg0 60)
(print-game-text-scaled
(lookup-text! *common-text* (text-id autosave-disabled-msg) #f)
(-> this transition-percentage-invert)
arg0
128
)
(let ((v1-18 arg0))
(set! (-> v1-18 scale) 0.65)
)
(set-scale! arg0 0.65)
(set! (-> arg0 origin y) 160.0)
(let ((v1-19 arg0))
(set! (-> v1-19 height) (the float 60))
)
(set-height! arg0 60)
(print-game-text-scaled
(lookup-text! *common-text* (text-id continue?) #f)
(-> this transition-percentage-invert)
@@ -998,30 +858,20 @@
;; definition for method 42 of type progress
;; INFO: Return type mismatch int vs none.
(defmethod draw-memcard-removed ((this progress) (arg0 font-context))
(let ((v1-0 arg0))
(set! (-> v1-0 scale) 0.6)
)
(set-scale! arg0 0.6)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(set! (-> arg0 origin x) (the float (- 70 (-> this left-x-offset))))
(set! (-> arg0 origin y) 10.0)
(let ((v1-4 arg0))
(set! (-> v1-4 width) (the float 265))
)
(let ((v1-5 arg0))
(set! (-> v1-5 height) (the float 55))
)
(set-width! arg0 265)
(set-height! arg0 55)
(let ((s4-0 print-game-text-scaled))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id memcard-removed) #f) 1)
(s4-0 *temp-string* (-> this transition-percentage-invert) arg0 128)
)
(set! (-> arg0 origin x) (the float (- 20 (-> this left-x-offset))))
(set! (-> arg0 origin y) 78.0)
(let ((v1-9 arg0))
(set! (-> v1-9 width) (the float 360))
)
(let ((v1-10 arg0))
(set! (-> v1-10 height) (the float 20))
)
(set-width! arg0 360)
(set-height! arg0 20)
(print-game-text-scaled
(lookup-text! *common-text* (text-id autosave-disabled-title) #f)
(-> this transition-percentage-invert)
@@ -1029,25 +879,17 @@
128
)
(set! (-> arg0 origin y) 112.0)
(let ((v1-12 arg0))
(set! (-> v1-12 width) (the float 360))
)
(let ((v1-13 arg0))
(set! (-> v1-13 height) (the float 60))
)
(set-width! arg0 360)
(set-height! arg0 60)
(print-game-text-scaled
(lookup-text! *common-text* (text-id autosave-disabled-msg) #f)
(-> this transition-percentage-invert)
arg0
128
)
(let ((v1-15 arg0))
(set! (-> v1-15 scale) 0.65)
)
(set-scale! arg0 0.65)
(set! (-> arg0 origin y) 160.0)
(let ((v1-16 arg0))
(set! (-> v1-16 height) (the float 60))
)
(set-height! arg0 60)
(print-game-text-scaled
(lookup-text! *common-text* (text-id continue?) #f)
(-> this transition-percentage-invert)
@@ -1062,15 +904,9 @@
;; INFO: Return type mismatch int vs none.
(defmethod draw-memcard-error ((this progress) (arg0 font-context))
(set! (-> arg0 origin y) 15.0)
(let ((v1-0 arg0))
(set! (-> v1-0 scale) 0.7)
)
(let ((v1-1 arg0))
(set! (-> v1-1 width) (the float 265))
)
(let ((v1-2 arg0))
(set! (-> v1-2 height) (the float 55))
)
(set-scale! arg0 0.7)
(set-width! arg0 265)
(set-height! arg0 55)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(let ((s4-0 (text-id error-loading)))
(case (-> this display-state)
@@ -1091,23 +927,15 @@
)
(set! (-> arg0 origin x) (the float (- 20 (-> this left-x-offset))))
(set! (-> arg0 origin y) 80.0)
(let ((v1-13 arg0))
(set! (-> v1-13 width) (the float 360))
)
(let ((v1-14 arg0))
(set! (-> v1-14 height) (the float 70))
)
(set-width! arg0 360)
(set-height! arg0 70)
(let ((s4-1 print-game-text-scaled))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id check-memcard-and-retry) #f) 1)
(s4-1 *temp-string* (-> this transition-percentage-invert) arg0 128)
)
(let ((v1-16 arg0))
(set! (-> v1-16 scale) 0.65)
)
(set-scale! arg0 0.65)
(set! (-> arg0 origin y) 155.0)
(let ((v1-17 arg0))
(set! (-> v1-17 height) (the float 60))
)
(set-height! arg0 60)
(print-game-text-scaled
(lookup-text! *common-text* (text-id continue?) #f)
(-> this transition-percentage-invert)
@@ -1123,15 +951,9 @@
(defmethod draw-auto-save ((this progress) (arg0 font-context))
(set! (-> arg0 origin x) (the float (- 35 (-> this left-x-offset))))
(set! (-> arg0 origin y) 18.0)
(let ((v1-2 arg0))
(set! (-> v1-2 scale) 0.6)
)
(let ((v1-3 arg0))
(set! (-> v1-3 width) (the float 330))
)
(let ((v1-4 arg0))
(set! (-> v1-4 height) (the float 60))
)
(set-scale! arg0 0.6)
(set-width! arg0 330)
(set-height! arg0 60)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(print-game-text-scaled
(lookup-text! *common-text* (text-id autosave-warn-title) #f)
@@ -1141,25 +963,17 @@
)
(set! (-> arg0 origin x) (the float (- 15 (-> this left-x-offset))))
(set! (-> arg0 origin y) 110.0)
(let ((v1-9 arg0))
(set! (-> v1-9 width) (the float 370))
)
(let ((v1-10 arg0))
(set! (-> v1-10 height) (the float 60))
)
(set-width! arg0 370)
(set-height! arg0 60)
(print-game-text-scaled
(lookup-text! *common-text* (text-id autosave-warn-msg) #f)
(-> this transition-percentage-invert)
arg0
128
)
(let ((v1-12 arg0))
(set! (-> v1-12 scale) 0.65)
)
(set-scale! arg0 0.65)
(set! (-> arg0 origin y) 175.0)
(let ((v1-13 arg0))
(set! (-> v1-13 height) (the float 20))
)
(set-height! arg0 20)
(print-game-text-scaled
(lookup-text! *common-text* (text-id continue?) #f)
(-> this transition-percentage-invert)
@@ -1191,15 +1005,9 @@
(defmethod draw-pal-change-to-60hz ((this progress) (arg0 font-context))
(set! (-> arg0 origin x) (the float (- 50 (-> this left-x-offset))))
(set! (-> arg0 origin y) 20.0)
(let ((v1-2 arg0))
(set! (-> v1-2 scale) 0.6)
)
(let ((v1-3 arg0))
(set! (-> v1-3 width) (the float 300))
)
(let ((v1-4 arg0))
(set! (-> v1-4 height) (the float 40))
)
(set-scale! arg0 0.6)
(set-width! arg0 300)
(set-height! arg0 40)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(print-game-text-scaled
(lookup-text! *common-text* (text-id screen-change-to-60hz) #f)
@@ -1209,12 +1017,8 @@
)
(set! (-> arg0 origin x) (the float (- 15 (-> this left-x-offset))))
(set! (-> arg0 origin y) 60.0)
(let ((v1-9 arg0))
(set! (-> v1-9 width) (the float 370))
)
(let ((v1-10 arg0))
(set! (-> v1-10 height) (the float 60))
)
(set-width! arg0 370)
(set-height! arg0 60)
(print-game-text-scaled
(lookup-text! *common-text* (text-id screen-60hz-warn-support) #f)
(-> this transition-percentage-invert)
@@ -1222,22 +1026,16 @@
128
)
(set! (-> arg0 origin y) 120.0)
(let ((v1-12 arg0))
(set! (-> v1-12 height) (the float 50))
)
(set-height! arg0 50)
(print-game-text-scaled
(lookup-text! *common-text* (text-id screen-60hz-warn-timer) #f)
(-> this transition-percentage-invert)
arg0
128
)
(let ((v1-14 arg0))
(set! (-> v1-14 scale) 0.65)
)
(set-scale! arg0 0.65)
(set! (-> arg0 origin y) 175.0)
(let ((v1-15 arg0))
(set! (-> v1-15 height) (the float 20))
)
(set-height! arg0 20)
(print-game-text-scaled
(lookup-text! *common-text* (text-id continue?) #f)
(-> this transition-percentage-invert)
@@ -1253,15 +1051,9 @@
(defmethod draw-no-disc ((this progress) (arg0 font-context))
(set! (-> arg0 origin x) (the float (- 50 (-> this left-x-offset))))
(set! (-> arg0 origin y) 50.0)
(let ((v1-2 arg0))
(set! (-> v1-2 scale) 0.6)
)
(let ((v1-3 arg0))
(set! (-> v1-3 width) (the float 300))
)
(let ((v1-4 arg0))
(set! (-> v1-4 height) (the float 40))
)
(set-scale! arg0 0.6)
(set-width! arg0 300)
(set-height! arg0 40)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(print-game-text-scaled
(lookup-text! *common-text* (text-id no-disc-title) #f)
@@ -1271,12 +1063,8 @@
)
(set! (-> arg0 origin x) (the float (- 20 (-> this left-x-offset))))
(set! (-> arg0 origin y) 90.0)
(let ((v1-9 arg0))
(set! (-> v1-9 width) (the float 360))
)
(let ((v1-10 arg0))
(set! (-> v1-10 height) (the float 60))
)
(set-width! arg0 360)
(set-height! arg0 60)
(print-game-text-scaled
(lookup-text! *common-text* (text-id no-disc-msg) #f)
(-> this transition-percentage-invert)
@@ -1284,13 +1072,9 @@
128
)
(when (is-cd-in?)
(let ((v1-13 arg0))
(set! (-> v1-13 scale) 0.65)
)
(set-scale! arg0 0.65)
(set! (-> arg0 origin y) 155.0)
(let ((v1-14 arg0))
(set! (-> v1-14 height) (the float 20))
)
(set-height! arg0 20)
(print-game-text-scaled
(lookup-text! *common-text* (text-id continue?) #f)
(-> this transition-percentage-invert)
@@ -1307,15 +1091,9 @@
(defmethod draw-bad-disc ((this progress) (arg0 font-context))
(set! (-> arg0 origin x) (the float (- 50 (-> this left-x-offset))))
(set! (-> arg0 origin y) 50.0)
(let ((v1-2 arg0))
(set! (-> v1-2 scale) 0.6)
)
(let ((v1-3 arg0))
(set! (-> v1-3 width) (the float 300))
)
(let ((v1-4 arg0))
(set! (-> v1-4 height) (the float 40))
)
(set-scale! arg0 0.6)
(set-width! arg0 300)
(set-height! arg0 40)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(print-game-text-scaled
(lookup-text! *common-text* (text-id bad-disc-title) #f)
@@ -1325,25 +1103,17 @@
)
(set! (-> arg0 origin x) (the float (- 20 (-> this left-x-offset))))
(set! (-> arg0 origin y) 90.0)
(let ((v1-9 arg0))
(set! (-> v1-9 width) (the float 360))
)
(let ((v1-10 arg0))
(set! (-> v1-10 height) (the float 60))
)
(set-width! arg0 360)
(set-height! arg0 60)
(print-game-text-scaled
(lookup-text! *common-text* (text-id bad-disc-msg) #f)
(-> this transition-percentage-invert)
arg0
128
)
(let ((v1-12 arg0))
(set! (-> v1-12 scale) 0.65)
)
(set-scale! arg0 0.65)
(set! (-> arg0 origin y) 155.0)
(let ((v1-13 arg0))
(set! (-> v1-13 height) (the float 20))
)
(set-height! arg0 20)
(print-game-text-scaled
(lookup-text! *common-text* (text-id continue?) #f)
(-> this transition-percentage-invert)
@@ -1359,15 +1129,9 @@
(defmethod draw-quit ((this progress) (arg0 font-context))
(set! (-> arg0 origin x) (the float (- 50 (-> this left-x-offset))))
(set! (-> arg0 origin y) 70.0)
(let ((v1-2 arg0))
(set! (-> v1-2 scale) 0.6)
)
(let ((v1-3 arg0))
(set! (-> v1-3 width) (the float 300))
)
(let ((v1-4 arg0))
(set! (-> v1-4 height) (the float 40))
)
(set-scale! arg0 0.6)
(set-width! arg0 300)
(set-height! arg0 40)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(print-game-text-scaled
(lookup-text! *common-text* (text-id quit?) #f)
@@ -1384,15 +1148,9 @@
(defmethod draw-pal-now-60hz ((this progress) (arg0 font-context))
(set! (-> arg0 origin x) (the float (- 50 (-> this left-x-offset))))
(set! (-> arg0 origin y) 45.0)
(let ((v1-2 arg0))
(set! (-> v1-2 scale) 0.6)
)
(let ((v1-3 arg0))
(set! (-> v1-3 width) (the float 300))
)
(let ((v1-4 arg0))
(set! (-> v1-4 height) (the float 50))
)
(set-scale! arg0 0.6)
(set-width! arg0 300)
(set-height! arg0 50)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(print-game-text-scaled
(lookup-text! *common-text* (text-id screen-now-60hz) #f)
@@ -1401,9 +1159,7 @@
128
)
(set! (-> arg0 origin y) 95.0)
(let ((v1-7 arg0))
(set! (-> v1-7 height) (the float 50))
)
(set-height! arg0 50)
(print-game-text-scaled
(lookup-text! *common-text* (text-id screen-60hz-keep?) #f)
(-> this transition-percentage-invert)
@@ -1615,12 +1371,8 @@
(set! sv-112
(new 'stack 'font-context *font-default-matrix* 0 0 0.0 (font-color default) (font-flags shadow kerning))
)
(let ((v1-11 sv-112))
(set! (-> v1-11 width) (the float 350))
)
(let ((v1-12 sv-112))
(set! (-> v1-12 height) (the float 25))
)
(set-width! sv-112 350)
(set-height! sv-112 25)
(set! (-> sv-112 flags) (font-flags shadow kerning middle middle-vert large))
(dotimes (s0-0 (length s3-0))
(set! sv-912 (the-as string #f))
@@ -1679,9 +1431,7 @@
(set! (-> sv-112 origin y) (the float (+ s2-1 -8)))
)
)
(let ((v1-64 sv-112))
(set! (-> v1-64 scale) 0.6)
)
(set-scale! sv-112 0.6)
(set! sv-288 print-game-text)
(let ((a0-23 (lookup-text! *common-text* (-> s3-0 s0-0 name) #f))
(a1-11 sv-112)
@@ -1958,9 +1708,7 @@
)
)
)
(let ((v1-246 sv-112))
(set! (-> v1-246 scale) (* arg2 f0-23))
)
(set-scale! sv-112 (* arg2 f0-23))
(let ((t9-60 print-game-text)
(a1-64 sv-112)
(a2-50 #f)
@@ -2061,26 +1809,14 @@
)
)
)
(let ((v1-29 s4-2))
(set! (-> v1-29 width) (the float 100))
)
(let ((v1-30 s4-2))
(set! (-> v1-30 height) (the float 15))
)
(let ((v1-31 s4-2))
(set! (-> v1-31 scale) 0.5)
)
(set-width! s4-2 100)
(set-height! s4-2 15)
(set-scale! s4-2 0.5)
(set! (-> s4-2 flags) (font-flags shadow kerning large))
(print-game-text (lookup-text! *common-text* (text-id options) #f) s4-2 #f 128 22)
(let ((v1-34 s4-2))
(set! (-> v1-34 width) (the float 160))
)
(let ((v1-35 s4-2))
(set! (-> v1-35 height) (the float 22))
)
(let ((v1-36 s4-2))
(set! (-> v1-36 scale) 1.3)
)
(set-width! s4-2 160)
(set-height! s4-2 22)
(set-scale! s4-2 1.3)
(let ((a0-31 s4-2))
(set! (-> a0-31 color) (font-color progress-percent))
)
test/decompiler/reference/jak1/engine/ui/progress/progress_REF.gc
Generated Vendored
+4 -12
View File
@@ -2370,12 +2370,8 @@
)
)
)
(let ((v1-103 s5-1))
(set! (-> v1-103 width) (the float 328))
)
(let ((v1-104 s5-1))
(set! (-> v1-104 height) (the float 45))
)
(set-width! s5-1 328)
(set-height! s5-1 45)
(set! (-> s5-1 flags) (font-flags shadow kerning middle middle-vert large))
(print-game-text-scaled
(lookup-text! *common-text* (-> gp-0 level-name-id) #f)
@@ -2655,12 +2651,8 @@
)
)
)
(let ((v1-42 gp-4))
(set! (-> v1-42 width) (the float 328))
)
(let ((v1-43 gp-4))
(set! (-> v1-43 height) (the float 100))
)
(set-width! gp-4 328)
(set-height! gp-4 100)
(logior! (-> gp-4 flags) (font-flags shadow kerning large))
(draw-debug-text-box gp-4)
(print-game-text (-> *common-text* data (-> self current-debug-string) text) gp-4 #f 128 22)
test/decompiler/reference/jak1/engine/ui/text_REF.gc
Generated Vendored
+1 -3
View File
@@ -278,9 +278,7 @@
(if (logtest? (-> font-ctxt flags) (font-flags middle-vert))
(+! (-> font-ctxt origin y) (the-as float (gpr->fpr (/ (the int (- f30-0 f1-2)) 2))))
)
(let ((v1-10 font-ctxt))
(set! (-> v1-10 scale) (* f28-0 scale))
)
(set-scale! font-ctxt (* f28-0 scale))
(set! (-> font-ctxt width) f0-1)
(set! (-> font-ctxt height) f1-2)
)
test/decompiler/reference/jak1/levels/firecanyon/assistant-firecanyon_REF.gc
Generated Vendored
+3 -9
View File
@@ -102,15 +102,9 @@
(new 'stack 'font-context *font-default-matrix* 32 160 0.0 (font-color default) (font-flags shadow kerning))
)
)
(let ((v1-26 gp-0))
(set! (-> v1-26 width) (the float 448))
)
(let ((v1-27 gp-0))
(set! (-> v1-27 height) (the float 80))
)
(let ((v1-28 gp-0))
(set! (-> v1-28 scale) 0.8)
)
(set-width! gp-0 448)
(set-height! gp-0 80)
(set-scale! gp-0 0.8)
(set! (-> gp-0 flags) (font-flags shadow kerning middle large))
(print-game-text (lookup-text! *common-text* (text-id firecanyon-need-cells-text) #f) gp-0 #f 128 22)
)
test/decompiler/reference/jak1/levels/flut_common/flutflut_REF.gc
Generated Vendored
+2 -6
View File
@@ -215,12 +215,8 @@
(new 'stack 'font-context *font-default-matrix* 32 160 0.0 (font-color default) (font-flags shadow kerning))
)
)
(let ((v1-34 gp-0))
(set! (-> v1-34 width) (the float 440))
)
(let ((v1-35 gp-0))
(set! (-> v1-35 height) (the float 80))
)
(set-width! gp-0 440)
(set-height! gp-0 80)
(set! (-> gp-0 flags) (font-flags shadow kerning large))
(print-game-text (lookup-text! *common-text* (text-id press-to-use) #f) gp-0 #f 128 22)
)
test/decompiler/reference/jak1/levels/jungle/fisher_REF.gc
Generated Vendored
+3 -9
View File
@@ -1136,15 +1136,9 @@
(new 'stack 'font-context *font-default-matrix* 435 10 0.0 (font-color red) (font-flags shadow kerning))
)
)
(let ((v1-1 s5-0))
(set! (-> v1-1 width) (the float 200))
)
(let ((v1-2 s5-0))
(set! (-> v1-2 height) (the float 30))
)
(let ((v1-3 s5-0))
(set! (-> v1-3 scale) 0.7)
)
(set-width! s5-0 200)
(set-height! s5-0 30)
(set-scale! s5-0 0.7)
(set! (-> s5-0 flags) (font-flags shadow kerning right large))
(print-game-text (lookup-text! *common-text* (text-id caught) #f) s5-0 #f 128 22)
(set! (-> s5-0 origin x) 488.0)
test/decompiler/reference/jak1/levels/jungle/jungle-mirrors_REF.gc
Generated Vendored
+2 -6
View File
@@ -1444,12 +1444,8 @@
(new 'stack 'font-context *font-default-matrix* 32 160 0.0 (font-color default) (font-flags shadow kerning))
)
)
(let ((v1-43 s2-2))
(set! (-> v1-43 width) (the float 440))
)
(let ((v1-44 s2-2))
(set! (-> v1-44 height) (the float 80))
)
(set-width! s2-2 440)
(set-height! s2-2 80)
(set! (-> s2-2 flags) (font-flags shadow kerning large))
(print-game-text (lookup-text! *common-text* (text-id press-to-use) #f) s2-2 #f 128 22)
)
test/decompiler/reference/jak1/levels/lavatube/assistant-lavatube_REF.gc
Generated Vendored
+3 -9
View File
@@ -86,15 +86,9 @@
(new 'stack 'font-context *font-default-matrix* 32 160 0.0 (font-color default) (font-flags shadow kerning))
)
)
(let ((v1-26 gp-0))
(set! (-> v1-26 width) (the float 448))
)
(let ((v1-27 gp-0))
(set! (-> v1-27 height) (the float 80))
)
(let ((v1-28 gp-0))
(set! (-> v1-28 scale) 0.8)
)
(set-width! gp-0 448)
(set-height! gp-0 80)
(set-scale! gp-0 0.8)
(set! (-> gp-0 flags) (font-flags shadow kerning middle large))
(print-game-text (lookup-text! *common-text* (text-id assistant-lavatube-need-cells-text) #f) gp-0 #f 128 22)
)
test/decompiler/reference/jak1/levels/misty/mistycannon_REF.gc
Generated Vendored
+2 -6
View File
@@ -1592,12 +1592,8 @@
(new 'stack 'font-context *font-default-matrix* 32 160 0.0 (font-color default) (font-flags shadow kerning))
)
)
(let ((v1-15 gp-0))
(set! (-> v1-15 width) (the float 440))
)
(let ((v1-16 gp-0))
(set! (-> v1-16 height) (the float 80))
)
(set-width! gp-0 440)
(set-height! gp-0 80)
(set! (-> gp-0 flags) (font-flags shadow kerning large))
(print-game-text (lookup-text! *common-text* (text-id press-to-use) #f) gp-0 #f 128 22)
)
test/decompiler/reference/jak1/levels/racer_common/racer_REF.gc
Generated Vendored
+2 -6
View File
@@ -247,12 +247,8 @@
(new 'stack 'font-context *font-default-matrix* 32 160 0.0 (font-color default) (font-flags shadow kerning))
)
)
(let ((v1-24 gp-0))
(set! (-> v1-24 width) (the float 440))
)
(let ((v1-25 gp-0))
(set! (-> v1-25 height) (the float 80))
)
(set-width! gp-0 440)
(set-height! gp-0 80)
(set! (-> gp-0 flags) (font-flags shadow kerning large))
(print-game-text (lookup-text! *common-text* (text-id press-to-use) #f) gp-0 #f 128 22)
)
test/decompiler/reference/jak1/levels/rolling/rolling-obs_REF.gc
Generated Vendored
+7 -21
View File
@@ -1190,15 +1190,9 @@
)
)
)
(let ((v1-1 gp-0))
(set! (-> v1-1 width) (the float 200))
)
(let ((v1-2 gp-0))
(set! (-> v1-2 height) (the float 50))
)
(let ((v1-3 gp-0))
(set! (-> v1-3 scale) 0.7)
)
(set-width! gp-0 200)
(set-height! gp-0 50)
(set-scale! gp-0 0.7)
(set! (-> gp-0 origin x) (the float (+ (-> self timer-pos-offset) 392)))
(set! (-> gp-0 origin y) (the float (- 10 (-> self timer-pos-offset))))
(set! (-> gp-0 flags) (font-flags shadow kerning right large))
@@ -1218,9 +1212,7 @@
)
((race-time-less-than (-> self this-time) (-> self record-time))
(when (< (mod (-> *display* real-frame-counter) 90) 60)
(let ((v1-18 gp-0))
(set! (-> v1-18 scale) 1.0)
)
(set-scale! gp-0 1.0)
(set! (-> gp-0 origin x) 156.0)
(set! (-> gp-0 origin y) 80.0)
(set! (-> gp-0 flags) (font-flags shadow kerning middle middle-vert large))
@@ -1252,9 +1244,7 @@
(ambient-hint-spawn "st-lose" (the-as vector #f) *entity-pool* 'stinger)
)
(when (< (mod (-> *display* real-frame-counter) 90) 60)
(let ((v1-30 gp-0))
(set! (-> v1-30 scale) 1.0)
)
(set-scale! gp-0 1.0)
(set! (-> gp-0 origin x) 156.0)
(set! (-> gp-0 origin y) 80.0)
(set! (-> gp-0 flags) (font-flags shadow kerning middle middle-vert large))
@@ -1330,12 +1320,8 @@
(new 'stack 'font-context *font-default-matrix* 156 80 0.0 (font-color red) (font-flags shadow kerning))
)
)
(let ((v1-20 gp-0))
(set! (-> v1-20 width) (the float 200))
)
(let ((v1-21 gp-0))
(set! (-> v1-21 height) (the float 50))
)
(set-width! gp-0 200)
(set-height! gp-0 50)
(set! (-> gp-0 flags) (font-flags shadow kerning middle middle-vert large))
(print-game-text (lookup-text! *common-text* (text-id race-aborted) #f) gp-0 #f 128 22)
)
test/decompiler/reference/jak1/levels/title/title-obs_REF.gc
Generated Vendored
+2 -6
View File
@@ -832,12 +832,8 @@
(new 'stack 'font-context *font-default-matrix* 80 170 0.0 (font-color default) (font-flags shadow kerning))
)
)
(let ((v1-12 gp-0))
(set! (-> v1-12 width) (the float 352))
)
(let ((v1-13 gp-0))
(set! (-> v1-13 height) (the float 40))
)
(set-width! gp-0 352)
(set-height! gp-0 40)
(set! (-> gp-0 flags) (font-flags shadow kerning middle middle-vert large))
(print-game-text (lookup-text! *common-text* (text-id press-start) #f) gp-0 #f 128 22)
)
test/decompiler/reference/jak1/levels/village1/fishermans-boat_REF.gc
Generated Vendored
+2 -6
View File
@@ -946,12 +946,8 @@
(new 'stack 'font-context *font-default-matrix* 32 160 0.0 (font-color default) (font-flags shadow kerning))
)
)
(let ((v1-17 s5-1))
(set! (-> v1-17 width) (the float 440))
)
(let ((v1-18 s5-1))
(set! (-> v1-18 height) (the float 80))
)
(set-width! s5-1 440)
(set-height! s5-1 80)
(set! (-> s5-1 flags) (font-flags shadow kerning large))
(print-game-text (lookup-text! *common-text* (text-id press-to-use) #f) s5-1 #f 128 22)
)
test/decompiler/reference/jak1/levels/village2/assistant-village2_REF.gc
Generated Vendored
+3 -9
View File
@@ -1395,15 +1395,9 @@
(new 'stack 'font-context *font-default-matrix* 32 160 0.0 (font-color default) (font-flags shadow kerning))
)
)
(let ((v1-28 gp-0))
(set! (-> v1-28 width) (the float 448))
)
(let ((v1-29 gp-0))
(set! (-> v1-29 height) (the float 80))
)
(let ((v1-30 gp-0))
(set! (-> v1-30 scale) 0.8)
)
(set-width! gp-0 448)
(set-height! gp-0 80)
(set-scale! gp-0 0.8)
(set! (-> gp-0 flags) (font-flags shadow kerning middle large))
(print-game-text (lookup-text! *common-text* (text-id village2-levitator-need-cells-text) #f) gp-0 #f 128 22)
)
test/decompiler/reference/jak1/levels/village3/village3-obs_REF.gc
Generated Vendored
+2 -6
View File
@@ -222,12 +222,8 @@
(new 'stack 'font-context *font-default-matrix* 32 160 0.0 (font-color default) (font-flags shadow kerning))
)
)
(let ((v1-59 s5-2))
(set! (-> v1-59 width) (the float 440))
)
(let ((v1-60 s5-2))
(set! (-> v1-60 height) (the float 80))
)
(set-width! s5-2 440)
(set-height! s5-2 80)
(set! (-> s5-2 flags) (font-flags shadow kerning large))
(print-game-text (lookup-text! *common-text* (text-id press-to-use) #f) s5-2 #f 128 22)
)
test/decompiler/reference/jak1/levels/village_common/villagep-obs_REF.gc
Generated Vendored
+7 -21
View File
@@ -161,15 +161,9 @@
(new 'stack 'font-context *font-default-matrix* 32 160 0.0 (font-color default) (font-flags shadow kerning))
)
)
(let ((v1-53 gp-0))
(set! (-> v1-53 width) (the float 440))
)
(let ((v1-54 gp-0))
(set! (-> v1-54 height) (the float 80))
)
(let ((v1-55 gp-0))
(set! (-> v1-55 scale) 0.9)
)
(set-width! gp-0 440)
(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-to-use) #f) gp-0 #f 128 22)
)
@@ -321,21 +315,13 @@
(new 'stack 'font-context *font-default-matrix* 6 110 0.0 (font-color default) (font-flags shadow kerning))
)
)
(let ((v1-38 s1-3))
(set! (-> v1-38 scale) 0.7)
)
(let ((v1-39 s1-3))
(set! (-> v1-39 width) (the float 500))
)
(let ((v1-40 s1-3))
(set! (-> v1-40 height) (the float 55))
)
(set-scale! s1-3 0.7)
(set-width! s1-3 500)
(set-height! s1-3 55)
(set! (-> s1-3 flags) (font-flags shadow kerning middle middle-vert large))
(print-game-text (lookup-text! *common-text* (text-id warp-gate-use-dpad) #f) s1-3 #f 128 22)
(+! (-> s1-3 origin y) 35.0)
(let ((v1-43 s1-3))
(set! (-> v1-43 height) (the float 40))
)
(set-height! s1-3 40)
(let ((a0-34 s1-3))
(set! (-> a0-34 color) (font-color progress-blue))
)
test/decompiler/reference/jak2/decompiler-macros.gc
Generated Vendored
+13
View File
@@ -1728,5 +1728,18 @@
(defmacro get-texture (name tpage)
`(lookup-texture-by-id ,(string->symbol-format "{}-{}" name tpage)))
(defmacro as-type (this type)
"If this is the specified type, return this cast to that type. Otherwise, return #f."
(with-gensyms (obj)
`(the ,type (let ((,obj ,this))
(if (type? ,obj ,type)
,obj
)
)
)
)
)
(import "goal_src/jak2/engine/data/tpages.gc")
(import "goal_src/jak2/engine/data/textures.gc")
test/decompiler/reference/jak2/engine/ai/enemy_REF.gc
Generated Vendored
+14 -61
View File
@@ -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)
test/decompiler/reference/jak2/engine/ambient/ambient_REF.gc
Generated Vendored
+9 -40
View File
@@ -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)
)
test/decompiler/reference/jak2/engine/anim/joint-mod_REF.gc
Generated Vendored
+2 -12
View File
@@ -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))
test/decompiler/reference/jak2/engine/camera/cam-master_REF.gc
Generated Vendored
+1 -7
View File
@@ -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
)
test/decompiler/reference/jak2/engine/camera/cam-states_REF.gc
Generated Vendored
+1 -5
View File
@@ -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))))
test/decompiler/reference/jak2/engine/collide/collide-shape_REF.gc
Generated Vendored
+1 -6
View File
@@ -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*)
)
test/decompiler/reference/jak2/engine/collide/find-nearest_REF.gc
Generated Vendored
+6 -24
View File
@@ -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))
test/decompiler/reference/jak2/engine/collide/los-control_REF.gc
Generated Vendored
+3 -13
View File
@@ -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))
test/decompiler/reference/jak2/engine/common_objs/collectables_REF.gc
Generated Vendored
+8 -33
View File
@@ -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))
test/decompiler/reference/jak2/engine/common_objs/conveyor_REF.gc
Generated Vendored
+1 -5
View File
@@ -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)
)
test/decompiler/reference/jak2/engine/common_objs/crates_REF.gc
Generated Vendored
+2 -12
View File
@@ -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))
test/decompiler/reference/jak2/engine/common_objs/elevator_REF.gc
Generated Vendored
+4 -24
View File
@@ -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)
test/decompiler/reference/jak2/engine/common_objs/generic-obs_REF.gc
Generated Vendored
+22 -125
View File
@@ -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))
test/decompiler/reference/jak2/engine/common_objs/plat_REF.gc
Generated Vendored
+2 -10
View File
@@ -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))
test/decompiler/reference/jak2/engine/common_objs/rigid-body-plat_REF.gc
Generated Vendored
+2 -12
View File
@@ -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))
test/decompiler/reference/jak2/engine/common_objs/voicebox_REF.gc
Generated Vendored
+3 -16
View File
@@ -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))
test/decompiler/reference/jak2/engine/common_objs/water-anim_REF.gc
Generated Vendored
+3 -7
View File
@@ -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)
test/decompiler/reference/jak2/engine/common_objs/water-flow_REF.gc
Generated Vendored
+1 -5
View File
@@ -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))
)
test/decompiler/reference/jak2/engine/common_objs/water_REF.gc
Generated Vendored
+12 -21
View File
@@ -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
test/decompiler/reference/jak2/engine/debug/editable-player_REF.gc
Generated Vendored
+10 -42
View File
@@ -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))
)
test/decompiler/reference/jak2/engine/debug/menu_REF.gc
Generated Vendored
+2 -14
View File
@@ -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))
test/decompiler/reference/jak2/engine/debug/nav/nav-graph-editor_REF.gc
Generated Vendored
+2 -10
View File
@@ -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))
test/decompiler/reference/jak2/engine/draw/drawable_REF.gc
Generated Vendored
+1 -6
View File
@@ -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))
)
test/decompiler/reference/jak2/engine/entity/entity_REF.gc
Generated Vendored
+15 -47
View File
@@ -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))
test/decompiler/reference/jak2/engine/game/effect-control_REF.gc
Generated Vendored
+3 -17
View File
@@ -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*
test/decompiler/reference/jak2/engine/game/game-save_REF.gc
Generated Vendored
+7 -21
View File
@@ -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))
test/decompiler/reference/jak2/engine/game/settings_REF.gc
Generated Vendored
+2 -7
View File
@@ -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))
test/decompiler/reference/jak2/engine/game/task/task-control_REF.gc
Generated Vendored
+6 -20
View File
@@ -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))
test/decompiler/reference/jak2/engine/gfx/foreground/merc/merc_REF.gc
Generated Vendored
+2 -12
View File
@@ -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))
)
test/decompiler/reference/jak2/engine/load/loader_REF.gc
Generated Vendored
+9 -32
View File
@@ -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))))
test/decompiler/reference/jak2/engine/nav/nav-mesh_REF.gc
Generated Vendored
+2 -12
View File
@@ -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))
)
test/decompiler/reference/jak2/engine/physics/rigid-body_REF.gc
Generated Vendored
+4 -21
View File
@@ -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))
test/decompiler/reference/jak2/engine/physics/trajectory_REF.gc
Generated Vendored
+21 -36
View File
@@ -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
test/decompiler/reference/jak2/engine/process-drawable/focus_REF.gc
Generated Vendored
+1 -6
View File
@@ -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)))
)
)
test/decompiler/reference/jak2/engine/process-drawable/process-drawable_REF.gc
Generated Vendored
+5 -25
View File
@@ -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))
test/decompiler/reference/jak2/engine/process-drawable/process-taskable_REF.gc
Generated Vendored
+3 -9
View File
@@ -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))
)
test/decompiler/reference/jak2/engine/scene/scene_REF.gc
Generated Vendored
+29 -60
View File
@@ -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!
test/decompiler/reference/jak2/engine/target/board/board-states_REF.gc
Generated Vendored
+1 -6
View File
@@ -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)
test/decompiler/reference/jak2/engine/target/gun/gun-dark-shot_REF.gc
Generated Vendored
+2 -12
View File
@@ -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
test/decompiler/reference/jak2/engine/target/gun/gun-red-shot_REF.gc
Generated Vendored
+4 -13
View File
@@ -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))
test/decompiler/reference/jak2/engine/target/gun/gun-util_REF.gc
Generated Vendored
+4 -8
View File
@@ -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
test/decompiler/reference/jak2/engine/target/mech/carry-h_REF.gc
Generated Vendored
+4 -24
View File
@@ -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))
)
test/decompiler/reference/jak2/engine/target/mech/mech-states_REF.gc
Generated Vendored
+10 -19
View File
@@ -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))
test/decompiler/reference/jak2/engine/target/mech/mech_REF.gc
Generated Vendored
+3 -9
View File
@@ -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)
test/decompiler/reference/jak2/engine/target/target-darkjak_REF.gc
Generated Vendored
+7 -12
View File
@@ -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))
test/decompiler/reference/jak2/engine/target/target-death_REF.gc
Generated Vendored
+3 -7
View File
@@ -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))
test/decompiler/reference/jak2/engine/target/target-handler_REF.gc
Generated Vendored
+1 -5
View File
@@ -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
test/decompiler/reference/jak2/engine/target/target-tube_REF.gc
Generated Vendored
+6 -15
View File
@@ -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)
)
)
)
test/decompiler/reference/jak2/engine/target/target-turret-shot_REF.gc
Generated Vendored
+1 -6
View File
@@ -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
test/decompiler/reference/jak2/engine/target/target-turret_REF.gc
Generated Vendored
+12 -44
View File
@@ -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))
)
test/decompiler/reference/jak2/engine/target/target-util_REF.gc
Generated Vendored
+4 -22
View File
@@ -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))
)
test/decompiler/reference/jak2/engine/target/target_REF.gc
Generated Vendored
+2 -11
View File
@@ -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))
)
test/decompiler/reference/jak2/engine/ui/bigmap_REF.gc
Generated Vendored
+7 -13
View File
@@ -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
test/decompiler/reference/jak2/engine/ui/minimap_REF.gc
Generated Vendored
+20 -50
View File
@@ -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
test/decompiler/reference/jak2/engine/ui/progress/progress-draw_REF.gc
Generated Vendored
+207 -571
View File
File diff suppressed because it is too large Load Diff
test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc
Generated Vendored
+3 -9
View File
@@ -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)
test/decompiler/reference/jak2/engine/ui/text_REF.gc
Generated Vendored
+1 -3
View File
@@ -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)
)
test/decompiler/reference/jak2/levels/atoll/atoll-obs_REF.gc
Generated Vendored
+1 -6
View File
@@ -802,12 +802,7 @@
(case message
(('touch 'attack)
(when (time-elapsed? (the-as int (-> self collide-off-timer)) (seconds 2))
(let* ((s4-0 proc)
(s3-0 (if (type? s4-0 process-focusable)
s4-0
)
)
)
(let ((s3-0 (the-as process (as-type proc process-focusable))))
(when s3-0
(let ((s4-1 (vector-z-quaternion! (new 'stack-no-clear 'vector) (-> self root quat))))
(let* ((v1-7 (vector-z-quaternion! (new 'stack-no-clear 'vector) (get-quat (the-as process-focusable s3-0) 0)))
test/decompiler/reference/jak2/levels/atoll/juicer_REF.gc
Generated Vendored
+1 -5
View File
@@ -164,11 +164,7 @@
;; definition for method 37 of type juicer-shot
(defmethod deal-damage! ((this juicer-shot) (arg0 process) (arg1 event-message-block))
"Constructs an [[attack-info]] according to the projectile's `options`"
(let ((a0-2 (if (type? arg0 process-focusable)
arg0
)
)
)
(let ((a0-2 (the-as process (as-type arg0 process-focusable))))
(when a0-2
(set! (-> this victim) (process->handle a0-2))
#t
test/decompiler/reference/jak2/levels/atoll/sig0-course_REF.gc
Generated Vendored
+1 -5
View File
@@ -175,11 +175,7 @@
(when (not (logtest? (-> arg0 bot-task-bits) (bot-task-bits botbits-4)))
(let ((s5-0 (handle->process (-> arg0 focus handle))))
(when s5-0
(let ((v1-9 (if (type? s5-0 nav-enemy)
s5-0
)
)
)
(let ((v1-9 (the-as process (as-type s5-0 nav-enemy))))
(when v1-9
(if (>= 20480.0 (- (-> (the-as process-focusable v1-9) root trans y) (-> arg0 root trans y)))
(logior! (-> arg0 bot-task-bits) (bot-task-bits botbits-4))
test/decompiler/reference/jak2/levels/castle/boss/castle-baron_REF.gc
Generated Vendored
+2 -12
View File
@@ -168,12 +168,7 @@
;; definition for method 45 of type cboss-elevator
(defmethod commited-to-ride? ((this cboss-elevator))
"@returns if the target is considered within the elevator area enough to begin descending/ascending"
(let* ((gp-0 *target*)
(a0-2 (if (type? gp-0 process-focusable)
gp-0
)
)
)
(let ((a0-2 (the-as target (as-type *target* process-focusable))))
(when a0-2
(let* ((v1-1 (get-trans a0-2 0))
(gp-2 (vector-! (new 'stack-no-clear 'vector) v1-1 (-> this root trans)))
@@ -2772,12 +2767,7 @@
(+! (-> self next-shooting-frame) 5)
)
)
(let* ((gp-5 *target*)
(a0-40 (if (type? gp-5 process-focusable)
gp-5
)
)
)
(let ((a0-40 (the-as target (as-type *target* process-focusable))))
(when a0-40
(let ((gp-6 (new 'stack-no-clear 'projectile-init-by-other-params)))
(let ((s4-0 (new 'stack-no-clear 'vector)))
test/decompiler/reference/jak2/levels/castle/castle-obs_REF.gc
Generated Vendored
+2 -12
View File
@@ -936,12 +936,7 @@
;; definition for method 45 of type cas-elevator
(defmethod commited-to-ride? ((this cas-elevator))
"@returns if the target is considered within the elevator area enough to begin descending/ascending"
(let* ((s5-0 *target*)
(a0-2 (if (type? s5-0 process-focusable)
s5-0
)
)
)
(let ((a0-2 (the-as target (as-type *target* process-focusable))))
(when a0-2
(let* ((a0-3 (get-trans a0-2 0))
(v1-2 (vector-! (new 'stack-no-clear 'vector) a0-3 (-> this root trans)))
@@ -1814,12 +1809,7 @@
0
(sound-play "trapdoor")
(let ((gp-1 (new 'stack 'joint-exploder-tuning (the-as uint 1))))
(let* ((s5-1 *target*)
(a0-3 (if (type? s5-1 process-focusable)
s5-1
)
)
)
(let ((a0-3 (the-as target (as-type *target* process-focusable))))
(when a0-3
(set! (-> gp-1 fountain-rand-transv-lo quad) (-> (get-trans a0-3 0) quad))
(+! (-> gp-1 fountain-rand-transv-lo y) -16384.0)
test/decompiler/reference/jak2/levels/castle/pad/caspad-obs_REF.gc
Generated Vendored
+1 -6
View File
@@ -59,12 +59,7 @@
;; definition for method 45 of type cpad-elevator
(defmethod commited-to-ride? ((this cpad-elevator))
"@returns if the target is considered within the elevator area enough to begin descending/ascending"
(let* ((target *target*)
(target-proc (if (type? target process-focusable)
target
)
)
)
(let ((target-proc (the-as target (as-type *target* process-focusable))))
(when target-proc
(let* ((target-pos (get-trans target-proc 0))
(dist-from-center (vector-! (new 'stack-no-clear 'vector) target-pos (-> this root trans)))
test/decompiler/reference/jak2/levels/castle/roboguard-level_REF.gc
Generated Vendored
+1 -6
View File
@@ -1060,12 +1060,7 @@
(else
(when (!= (-> arg0 type) target)
(-> arg1 param 0)
(let* ((s3-0 arg0)
(s1-0 (if (type? s3-0 process-focusable)
s3-0
)
)
)
(let ((s1-0 (the-as process (as-type arg0 process-focusable))))
(when (and s1-0 (logtest? (process-mask enemy) (-> s1-0 mask)))
(let ((s2-1
(vector-! (new 'stack-no-clear 'vector) (-> this root trans) (-> (the-as process-drawable s1-0) root trans))
test/decompiler/reference/jak2/levels/city/bombbot/bombbot_REF.gc
Generated Vendored
+13 -44
View File
@@ -1489,19 +1489,9 @@
(s3-0 (new 'stack-no-clear 'array 'collide-shape 64))
)
(countdown (s2-0 (fill-actor-list-for-sphere *actor-hash* (the-as sphere arg0) s3-0 64))
(let* ((s1-0 (-> s3-0 s2-0))
(a0-3 (if (type? s1-0 collide-shape)
s1-0
)
)
)
(let ((a0-3 (as-type (-> s3-0 s2-0) collide-shape)))
(when a0-3
(let* ((s0-0 (-> a0-3 process))
(s1-1 (if (type? s0-0 process-focusable)
s0-0
)
)
)
(let ((s1-1 (the-as process-drawable (as-type (-> a0-3 process) process-focusable))))
(when (and s1-1
(!= this s1-1)
(not (focus-test? this inactive))
@@ -1863,20 +1853,14 @@
)
)
((logtest? (-> (the-as collide-shape-prim v1-25) prim-core collide-as) (collide-spec civilian))
(let ((s1-1 process-drawable-shock-skel-effect)
(s0-1 (-> (the-as collide-shape-prim v1-25) cshape process))
)
(s1-1
(if (type? s0-1 process-focusable)
s0-1
)
(-> *lightning-spec-id-table* 5)
lightning-probe-callback
(-> *part-id-table* 166)
2048.0
-1
-1
)
(process-drawable-shock-skel-effect
(the-as process-drawable (as-type (-> (the-as collide-shape-prim v1-25) cshape process) process-focusable))
(-> *lightning-spec-id-table* 5)
lightning-probe-callback
(-> *part-id-table* 166)
2048.0
-1
-1
)
)
((logtest? (-> (the-as collide-shape-prim v1-25) prim-core collide-as) (collide-spec jak))
@@ -3164,12 +3148,7 @@
(let ((gp-0 0))
(let ((s5-0 10000))
(dotimes (s4-0 3)
(let* ((s2-0 (-> self slave s4-0 process 0))
(s3-0 (if (type? s2-0 bombbot)
(the-as bombbot s2-0)
)
)
)
(let ((s3-0 (as-type (-> self slave s4-0 process 0) bombbot)))
(when s3-0
(+! gp-0 1)
(let ((v1-14 (the int (* 0.000030517578 (vector-vector-xz-distance
@@ -3288,12 +3267,7 @@
)
(add-process *gui-control* self (gui-channel sig) (gui-action play) "bbotxplo" -99.0 0)
(dotimes (gp-1 3)
(let* ((s5-0 (-> self slave gp-1 process 0))
(a0-7 (if (type? s5-0 bombbot)
s5-0
)
)
)
(let ((a0-7 (the-as process (as-type (-> self slave gp-1 process 0) bombbot))))
(if a0-7
(send-event a0-7 'explode)
)
@@ -3381,12 +3355,7 @@
(let ((gp-0 0))
10000
(dotimes (s5-0 3)
(let* ((s4-0 (-> self slave s5-0 process 0))
(v1-6 (if (type? s4-0 bombbot)
(the-as bombbot s4-0)
)
)
)
(let ((v1-6 (as-type (-> self slave s5-0 process 0) bombbot)))
(when v1-6
(+! gp-0 1)
(when (= (-> v1-6 current-node) (+ (-> v1-6 city-path node-count) -1))
test/decompiler/reference/jak2/levels/city/common/pilot-states_REF.gc
Generated Vendored
+4 -14
View File
@@ -560,14 +560,9 @@
:event target-standard-event-handler
:exit target-pilot-exit
:trans (behavior ()
(let ((gp-0 (handle->process (-> self pilot vehicle))))
(when (not (if (type? gp-0 vehicle)
gp-0
)
)
(ja-channel-set! 0)
(go target-falling #f)
)
(when (not (the-as process (as-type (handle->process (-> self pilot vehicle)) vehicle)))
(ja-channel-set! 0)
(go target-falling #f)
)
)
:code (behavior ()
@@ -718,12 +713,7 @@
(set! (-> gp-0 pilot-start-grab-pos quad) (-> self control trans quad))
(set! (-> gp-0 actor-handle) (-> arg0 handle))
((-> target-edge-grab enter))
(let* ((s5-1 (handle->process (-> gp-0 actor-handle)))
(a0-9 (if (type? s5-1 process-focusable)
s5-1
)
)
)
(let ((a0-9 (the-as process (as-type (handle->process (-> gp-0 actor-handle)) process-focusable))))
(set! (-> gp-0 pilot-edge-grab?)
(if (and a0-9
(< 24576.0 (fabs (- (-> (get-trans (the-as process-focusable a0-9) 0) y) (-> self control trans y))))
test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc
Generated Vendored
+20 -77
View File
@@ -280,12 +280,7 @@
(let ((v1-5 (the-as object (-> block param 1))))
(when (!= (-> (the-as attack-info v1-5) id) (-> self incoming-attack-id))
(set! (-> self incoming-attack-id) (-> (the-as attack-info v1-5) id))
(let* ((s5-0 proc)
(s3-0 (if (type? s5-0 process-drawable)
(the-as process-drawable s5-0)
)
)
)
(let ((s3-0 (as-type proc process-drawable)))
(when s3-0
(let ((s5-1 (process-spawn
manipy
@@ -382,18 +377,9 @@
(set! (-> self flash) 0.375)
)
(+! (-> self touch-count) 1)
(let ((v1-83 (if (type? proc process-focusable)
(the-as process-focusable proc)
)
)
)
(let ((v1-83 (as-type proc process-focusable)))
(when v1-83
(let* ((gp-1 (-> v1-83 root))
(a0-45 (if (type? gp-1 collide-shape)
gp-1
)
)
)
(let ((a0-45 (as-type (-> v1-83 root) collide-shape)))
(if (and a0-45 (logtest? (-> a0-45 root-prim prim-core collide-as) (collide-spec jak)))
(security-wall-method-23 self)
)
@@ -2806,12 +2792,7 @@
(gp-3 (new 'stack-no-clear 'matrix))
)
(when (and (nonzero? (-> self handle)) (handle->process (-> self handle)))
(let* ((s3-0 (handle->process (-> self handle)))
(a0-25 (if (type? s3-0 process-focusable)
(the-as process-focusable s3-0)
)
)
)
(let ((a0-25 (as-type (handle->process (-> self handle)) process-focusable)))
(when a0-25
(vector-! s4-0 (-> a0-25 root trans) (-> self root trans))
(set! (-> self y-rot) (deg-seek
@@ -2838,19 +2819,9 @@
(s3-0 (new 'stack-no-clear 'array 'collide-shape 64))
)
(countdown (s2-0 (fill-actor-list-for-sphere *actor-hash* (the-as sphere arg0) s3-0 64))
(let* ((s1-0 (-> s3-0 s2-0))
(a0-3 (if (type? s1-0 collide-shape)
s1-0
)
)
)
(let ((a0-3 (as-type (-> s3-0 s2-0) collide-shape)))
(when a0-3
(let* ((s0-0 (-> a0-3 process))
(s1-1 (if (type? s0-0 process-focusable)
(the-as process-focusable s0-0)
)
)
)
(let ((s1-1 (as-type (-> a0-3 process) process-focusable)))
(when (and s1-1
(!= this s1-1)
(not (focus-test? s1-1 inactive))
@@ -3133,15 +3104,9 @@
)
)
(set! (-> s5-1 flags) (font-flags shadow kerning large))
(let ((v1-37 s5-1))
(set! (-> v1-37 width) (the float 340))
)
(let ((v1-38 s5-1))
(set! (-> v1-38 height) (the float 80))
)
(let ((v1-39 s5-1))
(set! (-> v1-39 scale) 0.9)
)
(set-width! s5-1 340)
(set-height! s5-1 80)
(set-scale! s5-1 0.9)
(let ((s4-1 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id press-triangle-to-talk) #f))
(s4-1 *temp-string* s5-1 #f 44 (bucket-id progress))
@@ -3551,22 +3516,10 @@
)
)
(set! (-> s1-0 flags) (font-flags shadow kerning middle middle-vert large))
(let ((v1-48 s1-0))
(set! (-> v1-48 width) (the float 440))
)
(let ((v1-49 s1-0))
(set! (-> v1-49 height) (the float 50))
)
(let ((v1-50 s1-0))
(set! (-> v1-50 scale) 1.0)
)
(let ((v1-51 s1-0)
(a1-3 s3-2)
(a0-59 40)
)
(set! (-> v1-51 origin x) (the float a1-3))
(set! (-> v1-51 origin y) (the float a0-59))
)
(set-width! s1-0 440)
(set-height! s1-0 50)
(set-scale! s1-0 1.0)
(set-origin! s1-0 s3-2 40)
(let ((a0-60 s1-0))
(set! (-> a0-60 color) (font-color progress-old-yellow))
)
@@ -3578,24 +3531,14 @@
)
(s0-0 *temp-string* s1-0 #f 44 (bucket-id progress))
)
(let ((v1-55 s1-0))
(set! (-> v1-55 height) (the float s4-9))
)
(set-height! s1-0 s4-9)
(dotimes (s0-1 gp-0)
(let ((v1-56 s1-0)
(a1-7 s3-2)
(a0-66 s2-0)
)
(set! (-> v1-56 origin x) (the float a1-7))
(set! (-> v1-56 origin y) (the float a0-66))
)
(let ((v1-57 s1-0))
(set! (-> v1-57 scale) (if (= s0-1 s5-0)
0.8
0.6
)
)
)
(set-origin! s1-0 s3-2 s2-0)
(set-scale! s1-0 (if (= s0-1 s5-0)
0.8
0.6
)
)
(let ((a0-68 s1-0))
(set! (-> a0-68 color) (if (= s0-1 s5-0)
(font-color progress-old-selected)
test/decompiler/reference/jak2/levels/city/kiddogescort/crocesc-states_REF.gc
Generated Vendored
+1 -6
View File
@@ -355,12 +355,7 @@
(logclear! (-> self bot-flags) (bot-flags bf15))
(go-idle-or-move self)
)
(let* ((s5-0 (handle->process (-> self kid-handle)))
(a2-0 (if (type? s5-0 process-focusable)
s5-0
)
)
)
(let ((a2-0 (the-as process (as-type (handle->process (-> self kid-handle)) process-focusable))))
(if a2-0
(put-rider-in-seat (the-as vehicle gp-0) (-> self vehicle-seat-index) (the-as process-focusable a2-0))
)
test/decompiler/reference/jak2/levels/city/kiddogescort/crocesc4-course_REF.gc
Generated Vendored
+19 -114
View File
@@ -80,12 +80,7 @@
(function crocesct-wait-spot crocadog-escort symbol)
(lambda ((arg0 object) (arg1 crocadog-escort))
(when (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f)
(let* ((s5-0 (handle->process (-> arg1 kid-handle)))
(a0-6 (if (type? s5-0 process-focusable)
s5-0
)
)
)
(let ((a0-6 (the-as process (as-type (handle->process (-> arg1 kid-handle)) process-focusable))))
(when (or (not a0-6)
(>= 20480.0 (vector-vector-distance (get-trans (the-as process-focusable a0-6) 0) (-> arg1 root trans)))
)
@@ -120,12 +115,7 @@
(function crocesct-wait-spot crocadog-escort symbol)
(lambda ((arg0 object) (arg1 crocadog-escort))
(when (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f)
(let* ((s5-0 (handle->process (-> arg1 kid-handle)))
(a0-6 (if (type? s5-0 process-focusable)
s5-0
)
)
)
(let ((a0-6 (the-as process (as-type (handle->process (-> arg1 kid-handle)) process-focusable))))
(when (or (not a0-6)
(>= 20480.0 (vector-vector-distance (get-trans (the-as process-focusable a0-6) 0) (-> arg1 root trans)))
)
@@ -163,12 +153,7 @@
(function crocesct-wait-spot crocadog-escort symbol)
(lambda ((arg0 object) (arg1 crocadog-escort))
(when (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f)
(let* ((s5-0 (handle->process (-> arg1 kid-handle)))
(a0-6 (if (type? s5-0 process-focusable)
s5-0
)
)
)
(let ((a0-6 (the-as process (as-type (handle->process (-> arg1 kid-handle)) process-focusable))))
(when (or (not a0-6)
(>= 20480.0 (vector-vector-distance (get-trans (the-as process-focusable a0-6) 0) (-> arg1 root trans)))
)
@@ -206,12 +191,7 @@
(function crocesct-wait-spot crocadog-escort symbol)
(lambda ((arg0 object) (arg1 crocadog-escort))
(when (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f)
(let* ((s5-0 (handle->process (-> arg1 kid-handle)))
(a0-6 (if (type? s5-0 process-focusable)
s5-0
)
)
)
(let ((a0-6 (the-as process (as-type (handle->process (-> arg1 kid-handle)) process-focusable))))
(when (or (not a0-6)
(>= 20480.0 (vector-vector-distance (get-trans (the-as process-focusable a0-6) 0) (-> arg1 root trans)))
)
@@ -246,12 +226,7 @@
(function crocesct-wait-spot crocadog-escort symbol)
(lambda ((arg0 object) (arg1 crocadog-escort))
(when (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f)
(let* ((s5-0 (handle->process (-> arg1 kid-handle)))
(a0-6 (if (type? s5-0 process-focusable)
s5-0
)
)
)
(let ((a0-6 (the-as process (as-type (handle->process (-> arg1 kid-handle)) process-focusable))))
(when (or (not a0-6)
(>= 20480.0 (vector-vector-distance (get-trans (the-as process-focusable a0-6) 0) (-> arg1 root trans)))
)
@@ -286,12 +261,7 @@
(function crocesct-wait-spot crocadog-escort symbol)
(lambda ((arg0 object) (arg1 crocadog-escort))
(when (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f)
(let* ((s5-0 (handle->process (-> arg1 kid-handle)))
(a0-6 (if (type? s5-0 process-focusable)
s5-0
)
)
)
(let ((a0-6 (the-as process (as-type (handle->process (-> arg1 kid-handle)) process-focusable))))
(when (or (not a0-6)
(>= 20480.0 (vector-vector-distance (get-trans (the-as process-focusable a0-6) 0) (-> arg1 root trans)))
)
@@ -329,12 +299,7 @@
(function crocesct-wait-spot crocadog-escort symbol)
(lambda ((arg0 object) (arg1 crocadog-escort))
(when (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f)
(let* ((s5-0 (handle->process (-> arg1 kid-handle)))
(a0-6 (if (type? s5-0 process-focusable)
s5-0
)
)
)
(let ((a0-6 (the-as process (as-type (handle->process (-> arg1 kid-handle)) process-focusable))))
(when (or (not a0-6)
(>= 20480.0 (vector-vector-distance (get-trans (the-as process-focusable a0-6) 0) (-> arg1 root trans)))
)
@@ -369,12 +334,7 @@
(function crocesct-wait-spot crocadog-escort symbol)
(lambda ((arg0 object) (arg1 crocadog-escort))
(when (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f)
(let* ((s5-0 (handle->process (-> arg1 kid-handle)))
(a0-6 (if (type? s5-0 process-focusable)
s5-0
)
)
)
(let ((a0-6 (the-as process (as-type (handle->process (-> arg1 kid-handle)) process-focusable))))
(when (or (not a0-6)
(>= 20480.0 (vector-vector-distance (get-trans (the-as process-focusable a0-6) 0) (-> arg1 root trans)))
)
@@ -409,12 +369,7 @@
(function crocesct-wait-spot crocadog-escort symbol)
(lambda ((arg0 object) (arg1 crocadog-escort))
(when (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f)
(let* ((s5-0 (handle->process (-> arg1 kid-handle)))
(a0-6 (if (type? s5-0 process-focusable)
s5-0
)
)
)
(let ((a0-6 (the-as process (as-type (handle->process (-> arg1 kid-handle)) process-focusable))))
(when (or (not a0-6)
(>= 20480.0 (vector-vector-distance (get-trans (the-as process-focusable a0-6) 0) (-> arg1 root trans)))
)
@@ -449,12 +404,7 @@
(function crocesct-wait-spot crocadog-escort symbol)
(lambda ((arg0 object) (arg1 crocadog-escort))
(when (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f)
(let* ((s5-0 (handle->process (-> arg1 kid-handle)))
(a0-6 (if (type? s5-0 process-focusable)
s5-0
)
)
)
(let ((a0-6 (the-as process (as-type (handle->process (-> arg1 kid-handle)) process-focusable))))
(when (or (not a0-6)
(>= 20480.0 (vector-vector-distance (get-trans (the-as process-focusable a0-6) 0) (-> arg1 root trans)))
)
@@ -489,12 +439,7 @@
(function crocesct-wait-spot crocadog-escort symbol)
(lambda ((arg0 object) (arg1 crocadog-escort))
(when (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f)
(let* ((s5-0 (handle->process (-> arg1 kid-handle)))
(a0-6 (if (type? s5-0 process-focusable)
s5-0
)
)
)
(let ((a0-6 (the-as process (as-type (handle->process (-> arg1 kid-handle)) process-focusable))))
(when (or (not a0-6)
(>= 20480.0 (vector-vector-distance (get-trans (the-as process-focusable a0-6) 0) (-> arg1 root trans)))
)
@@ -532,12 +477,7 @@
(function crocesct-wait-spot crocadog-escort symbol)
(lambda ((arg0 object) (arg1 crocadog-escort))
(when (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f)
(let* ((s5-0 (handle->process (-> arg1 kid-handle)))
(a0-6 (if (type? s5-0 process-focusable)
s5-0
)
)
)
(let ((a0-6 (the-as process (as-type (handle->process (-> arg1 kid-handle)) process-focusable))))
(when (or (not a0-6)
(>= 20480.0 (vector-vector-distance (get-trans (the-as process-focusable a0-6) 0) (-> arg1 root trans)))
)
@@ -572,12 +512,7 @@
(function crocesct-wait-spot crocadog-escort symbol)
(lambda ((arg0 object) (arg1 crocadog-escort))
(when (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f)
(let* ((s5-0 (handle->process (-> arg1 kid-handle)))
(a0-6 (if (type? s5-0 process-focusable)
s5-0
)
)
)
(let ((a0-6 (the-as process (as-type (handle->process (-> arg1 kid-handle)) process-focusable))))
(when (or (not a0-6)
(>= 20480.0 (vector-vector-distance (get-trans (the-as process-focusable a0-6) 0) (-> arg1 root trans)))
)
@@ -632,12 +567,7 @@
(function crocesct-wait-spot crocadog-escort symbol)
(lambda ((arg0 object) (arg1 crocadog-escort))
(when (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f)
(let* ((s5-0 (handle->process (-> arg1 kid-handle)))
(a0-6 (if (type? s5-0 process-focusable)
s5-0
)
)
)
(let ((a0-6 (the-as process (as-type (handle->process (-> arg1 kid-handle)) process-focusable))))
(when (or (not a0-6)
(>= 20480.0 (vector-vector-distance (get-trans (the-as process-focusable a0-6) 0) (-> arg1 root trans)))
)
@@ -735,12 +665,7 @@
(function crocesct-wait-spot crocadog-escort symbol)
(lambda ((arg0 object) (arg1 crocadog-escort))
(when (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f)
(let* ((s5-0 (handle->process (-> arg1 kid-handle)))
(a0-6 (if (type? s5-0 process-focusable)
s5-0
)
)
)
(let ((a0-6 (the-as process (as-type (handle->process (-> arg1 kid-handle)) process-focusable))))
(when (or (not a0-6)
(>= 20480.0 (vector-vector-distance (get-trans (the-as process-focusable a0-6) 0) (-> arg1 root trans)))
)
@@ -783,12 +708,7 @@
(function crocesct-wait-spot crocadog-escort symbol)
(lambda ((arg0 object) (arg1 crocadog-escort))
(when (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f)
(let* ((s5-0 (handle->process (-> arg1 kid-handle)))
(a0-6 (if (type? s5-0 process-focusable)
s5-0
)
)
)
(let ((a0-6 (the-as process (as-type (handle->process (-> arg1 kid-handle)) process-focusable))))
(when (or (not a0-6)
(>= 20480.0 (vector-vector-distance (get-trans (the-as process-focusable a0-6) 0) (-> arg1 root trans)))
)
@@ -823,12 +743,7 @@
(function crocesct-wait-spot crocadog-escort symbol)
(lambda ((arg0 object) (arg1 crocadog-escort))
(when (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f)
(let* ((s5-0 (handle->process (-> arg1 kid-handle)))
(a0-6 (if (type? s5-0 process-focusable)
s5-0
)
)
)
(let ((a0-6 (the-as process (as-type (handle->process (-> arg1 kid-handle)) process-focusable))))
(when (or (not a0-6)
(>= 20480.0 (vector-vector-distance (get-trans (the-as process-focusable a0-6) 0) (-> arg1 root trans)))
)
@@ -868,12 +783,7 @@
(function crocesct-wait-spot crocadog-escort symbol)
(lambda ((arg0 object) (arg1 crocadog-escort))
(when (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f)
(let* ((s5-0 (handle->process (-> arg1 kid-handle)))
(a0-6 (if (type? s5-0 process-focusable)
s5-0
)
)
)
(let ((a0-6 (the-as process (as-type (handle->process (-> arg1 kid-handle)) process-focusable))))
(when (or (not a0-6)
(>= 20480.0 (vector-vector-distance (get-trans (the-as process-focusable a0-6) 0) (-> arg1 root trans)))
)
@@ -908,12 +818,7 @@
(function crocesct-wait-spot crocadog-escort symbol)
(lambda ((arg0 object) (arg1 crocadog-escort))
(when (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f)
(let* ((s5-0 (handle->process (-> arg1 kid-handle)))
(a0-6 (if (type? s5-0 process-focusable)
s5-0
)
)
)
(let ((a0-6 (the-as process (as-type (handle->process (-> arg1 kid-handle)) process-focusable))))
(when (or (not a0-6)
(>= 20480.0 (vector-vector-distance (get-trans (the-as process-focusable a0-6) 0) (-> arg1 root trans)))
)
test/decompiler/reference/jak2/levels/city/kiddogescort/crocesc_REF.gc
Generated Vendored
+3 -21
View File
@@ -285,12 +285,7 @@
;; definition for method 97 of type crocadog-escort
(defmethod enemy-method-97 ((this crocadog-escort))
(let* ((s4-0 (handle->process (-> this attacker-handle)))
(s5-0 (if (type? s4-0 process-focusable)
s4-0
)
)
)
(let ((s5-0 (the-as process (as-type (handle->process (-> this attacker-handle)) process-focusable))))
(when s5-0
(when (time-elapsed? (-> this attacker-time) (seconds 3))
(set! s5-0 (the-as process #f))
@@ -302,15 +297,7 @@
(s5-0
(empty)
)
((begin
(let ((s4-1 (handle->process (-> this poi-handle))))
(set! s5-0 (if (type? s4-1 process-focusable)
s4-1
)
)
)
s5-0
)
((begin (set! s5-0 (the-as process (as-type (handle->process (-> this poi-handle)) process-focusable))) s5-0)
(empty)
)
(else
@@ -320,12 +307,7 @@
(empty)
)
(else
(let ((s4-2 (handle->process (-> this kid-handle))))
(set! s5-0 (if (type? s4-2 process-focusable)
s4-2
)
)
)
(set! s5-0 (the-as process (as-type (handle->process (-> this kid-handle)) process-focusable)))
*target*
(let ((f30-0 -1.0)
(f28-0 (vector-vector-distance (target-pos 0) (-> this root trans)))
test/decompiler/reference/jak2/levels/city/kiddogescort/hal4-course_REF.gc
Generated Vendored
+105 -265
View File
@@ -153,12 +153,7 @@
;; definition for method 235 of type hal-escort
(defmethod hal-escort-method-235 ((this hal-escort))
(let* ((s5-0 (handle->process (-> this arrestor-handle)))
(v1-3 (if (type? s5-0 process-focusable)
s5-0
)
)
)
(let ((v1-3 (the-as process (as-type (handle->process (-> this arrestor-handle)) process-focusable))))
(when v1-3
(cond
((time-elapsed? (-> this arrestor-time) (seconds 4))
@@ -207,24 +202,16 @@
(let ((s5-0 *target*))
(when (focus-test? s5-0 pilot-riding pilot)
(let* ((a0-2 (-> this actor-group 0 data 1 actor))
(v1-5 (when a0-2
(let ((s4-0 (-> a0-2 extra process)))
(if (type? s4-0 process-focusable)
s4-0
)
(v1-5 (if a0-2
(the-as process (as-type (-> a0-2 extra process) process-focusable))
)
)
)
)
(when (focus-test? (the-as process-focusable v1-5) pilot-riding pilot)
(let* ((v1-12 (-> this actor-group 0 data 2 actor))
(a0-5 (when v1-12
(let ((s4-1 (-> v1-12 extra process)))
(if (type? s4-1 process-focusable)
s4-1
)
(a0-5 (if v1-12
(the-as process (as-type (-> v1-12 extra process) process-focusable))
)
)
)
)
(when (not (focus-test? (the-as process-focusable a0-5) pilot-riding pilot))
@@ -247,13 +234,9 @@
;; WARN: Return type mismatch object vs symbol.
(defmethod hal-escort-method-228 ((this hal-escort))
(let* ((v1-3 (-> this actor-group 0 data 1 actor))
(a0-1 (when v1-3
(let ((s5-0 (-> v1-3 extra process)))
(if (type? s5-0 process-focusable)
s5-0
)
(a0-1 (if v1-3
(the-as process (as-type (-> v1-3 extra process) process-focusable))
)
)
)
(s5-1 *target*)
)
@@ -279,13 +262,9 @@
(defmethod hal-escort-method-234 ((this hal-escort) (arg0 nav-mesh))
(let ((s2-0 (the-as process #f)))
(let* ((v1-3 (-> this actor-group 0 data 1 actor))
(gp-0 (when v1-3
(let ((s5-0 (-> v1-3 extra process)))
(if (type? s5-0 process-focusable)
s5-0
)
(gp-0 (if v1-3
(the-as process (as-type (-> v1-3 extra process) process-focusable))
)
)
)
(s5-1 (new 'stack-no-clear 'vector))
)
@@ -316,14 +295,11 @@
(set! (-> s2-2 nav-branch) #f)
(set! (-> s2-2 proc) #f)
(let ((v1-25 (-> this actor-group 0 data 1 actor)))
(set! (-> s2-2 handle) (process->handle (when v1-25
(let ((s4-1 (-> v1-25 extra process)))
(if (type? s4-1 process-focusable)
s4-1
)
)
)
)
(set! (-> s2-2 handle)
(process->handle (if v1-25
(the-as process (as-type (-> v1-25 extra process) process-focusable))
)
)
)
)
(set! (-> s2-2 user-data) (the-as uint 0))
@@ -349,13 +325,9 @@
"Returns seat index"
(let* ((gp-0 (handle->process (-> this vehicle-handle)))
(v1-6 (-> this actor-group 0 data 1 actor))
(s5-0 (when v1-6
(let ((s4-0 (-> v1-6 extra process)))
(if (type? s4-0 process-focusable)
s4-0
)
(s5-0 (if v1-6
(the-as process (as-type (-> v1-6 extra process) process-focusable))
)
)
)
(s4-1 -1)
)
@@ -381,22 +353,14 @@
(defmethod hal-escort-method-232 ((this hal-escort))
(let* ((target *target*)
(v1-3 (-> this actor-group 0 data 1 actor))
(s5-0 (when v1-3
(let ((s3-0 (-> v1-3 extra process)))
(if (type? s3-0 process-focusable)
s3-0
)
(s5-0 (if v1-3
(the-as process (as-type (-> v1-3 extra process) process-focusable))
)
)
)
(a0-2 (-> this actor-group 0 data 2 actor))
(v1-8 (when a0-2
(let ((s3-1 (-> a0-2 extra process)))
(if (type? s3-1 process-focusable)
s3-1
)
(v1-8 (if a0-2
(the-as process (as-type (-> a0-2 extra process) process-focusable))
)
)
)
)
(when target
@@ -601,12 +565,7 @@
(dotimes (s4-0 *actor-list-length*)
(let ((v1-27 (-> *actor-list* s4-0)))
(when (logtest? (the-as collide-spec s5-0) (-> v1-27 root-prim prim-core collide-as))
(let* ((s3-0 (-> v1-27 process))
(a0-16 (if (type? s3-0 process-focusable)
s3-0
)
)
)
(let ((a0-16 (the-as process-drawable (as-type (-> v1-27 process) process-focusable))))
(when (and a0-16 (= (-> a0-16 type) crimson-guard))
(let ((s3-1 (get-trans (the-as process-focusable a0-16) 0)))
(if (and (>= (-> gp-0 vector 1 w) (vector-vector-xz-distance (-> gp-0 vector 1) s3-1))
@@ -630,23 +589,15 @@
(when (not (channel-active? this (gui-channel none)))
(let ((s5-0 0))
(let* ((v1-5 (-> this actor-group 0 data 1 actor))
(s4-0 (when v1-5
(let ((s3-0 (-> v1-5 extra process)))
(if (type? s3-0 process-focusable)
s3-0
)
(s4-0 (if v1-5
(the-as process (as-type (-> v1-5 extra process) process-focusable))
)
)
)
)
(let* ((a0-3 (-> this actor-group 0 data 2 actor))
(v1-10 (when a0-3
(let ((s3-1 (-> a0-3 extra process)))
(if (type? s3-1 process-focusable)
s3-1
)
(v1-10 (if a0-3
(the-as process (as-type (-> a0-3 extra process) process-focusable))
)
)
)
)
(if (or (logtest? (-> (the-as process-focusable s4-0) draw status) (draw-control-status on-screen))
@@ -705,13 +656,9 @@
(defun hal4-walking-too-far ((arg0 hal-escort))
(let ((gp-0 0))
(let* ((v1-3 (-> arg0 actor-group 0 data 1 actor))
(a0-1 (when v1-3
(let ((s4-0 (-> v1-3 extra process)))
(if (type? s4-0 process-focusable)
s4-0
)
(a0-1 (if v1-3
(the-as process (as-type (-> v1-3 extra process) process-focusable))
)
)
)
)
(if (and a0-1 (>= (vector-vector-xz-distance (get-trans (the-as process-focusable a0-1) 0) (target-pos 0))
@@ -828,22 +775,14 @@
(function halt-wait-spot hal symbol)
(lambda ((arg0 object) (arg1 hal-escort))
(let* ((v1-3 (-> arg1 actor-group 0 data 1 actor))
(s4-0 (when v1-3
(let ((s5-0 (-> v1-3 extra process)))
(if (type? s5-0 process-focusable)
s5-0
)
(s4-0 (if v1-3
(the-as process (as-type (-> v1-3 extra process) process-focusable))
)
)
)
(v1-8 (-> arg1 actor-group 0 data 2 actor))
(s5-1 (when v1-8
(let ((s3-0 (-> v1-8 extra process)))
(if (type? s3-0 process-focusable)
s3-0
)
(s5-1 (if v1-8
(the-as process (as-type (-> v1-8 extra process) process-focusable))
)
)
)
(v1-10 (the-as process *traffic-manager*))
)
@@ -939,13 +878,9 @@
(local-vars (v1-14 symbol))
(let ((s5-0 (new 'stack-no-clear 'vector)))
(let* ((v1-3 (-> arg1 actor-group 0 data 1 actor))
(a0-1 (when v1-3
(let ((s4-0 (-> v1-3 extra process)))
(if (type? s4-0 process-focusable)
s4-0
)
(a0-1 (if v1-3
(the-as process (as-type (-> v1-3 extra process) process-focusable))
)
)
)
)
(when a0-1
@@ -1017,13 +952,9 @@
)
(when (speech-playing? arg1 3)
(let* ((v1-27 (-> arg1 actor-group 0 data 2 actor))
(a0-11 (when v1-27
(let ((s5-0 (-> v1-27 extra process)))
(if (type? s5-0 process-focusable)
s5-0
)
(a0-11 (if v1-27
(the-as process (as-type (-> v1-27 extra process) process-focusable))
)
)
)
)
(when (and a0-11 (>= (the-as int (send-event a0-11 'query 'waypoint)) 6))
@@ -1071,13 +1002,9 @@
(return #t)
)
(let* ((v1-25 (-> arg1 actor-group 0 data 2 actor))
(a0-9 (when v1-25
(let ((s5-0 (-> v1-25 extra process)))
(if (type? s5-0 process-focusable)
s5-0
)
(a0-9 (if v1-25
(the-as process (as-type (-> v1-25 extra process) process-focusable))
)
)
)
)
(when (and a0-9 (>= (the-as int (send-event a0-9 'query 'waypoint)) 15))
@@ -1131,22 +1058,14 @@
(return #t)
)
(let* ((v1-38 (-> arg1 actor-group 0 data 1 actor))
(s4-0 (when v1-38
(let ((s5-0 (-> v1-38 extra process)))
(if (type? s5-0 process-focusable)
s5-0
)
(s4-0 (if v1-38
(the-as process (as-type (-> v1-38 extra process) process-focusable))
)
)
)
(v1-43 (-> arg1 actor-group 0 data 2 actor))
(s5-1 (when v1-43
(let ((s3-0 (-> v1-43 extra process)))
(if (type? s3-0 process-focusable)
s3-0
)
(s5-1 (if v1-43
(the-as process (as-type (-> v1-43 extra process) process-focusable))
)
)
)
(a0-16 s4-0)
)
@@ -1201,22 +1120,14 @@
(ai-task-control-method-12 (-> arg0 ai-ctrl) arg0)
(send-event *target* 'continue (get-continue-by-name *game-info* "lkiddoge-skip0"))
(let* ((v1-16 (-> arg0 actor-group 0 data 2 actor))
(s5-1 (when v1-16
(let ((s4-0 (-> v1-16 extra process)))
(if (type? s4-0 process-focusable)
s4-0
)
(s5-1 (if v1-16
(the-as process (as-type (-> v1-16 extra process) process-focusable))
)
)
)
(v1-21 (-> arg0 actor-group 0 data 1 actor))
(s4-1 (when v1-21
(let ((s3-0 (-> v1-21 extra process)))
(if (type? s3-0 process-focusable)
s3-0
)
(s4-1 (if v1-21
(the-as process (as-type (-> v1-21 extra process) process-focusable))
)
)
)
)
(send-event s5-1 'skip)
@@ -1266,31 +1177,18 @@
(return #t)
)
(let* ((v1-45 (-> arg1 actor-group 0 data 1 actor))
(s5-0 (when v1-45
(let ((s4-0 (-> v1-45 extra process)))
(if (type? s4-0 process-focusable)
s4-0
)
(s5-0 (if v1-45
(the-as process (as-type (-> v1-45 extra process) process-focusable))
)
)
)
(v1-50 (-> arg1 actor-group 0 data 2 actor))
(s4-1 (when v1-50
(let ((s3-0 (-> v1-50 extra process)))
(if (type? s3-0 process-focusable)
s3-0
)
(s4-1 (if v1-50
(the-as process (as-type (-> v1-50 extra process) process-focusable))
)
)
)
)
(let ((s3-1 #f))
(let* ((s1-0 (handle->process (-> arg1 vehicle-handle)))
(s2-0 (if (type? s1-0 process-focusable)
s1-0
)
)
)
(let ((s2-0 (the-as process (as-type (handle->process (-> arg1 vehicle-handle)) process-focusable))))
(when s2-0
(let ((s1-1 (get-trans (the-as process-focusable s2-0) 0))
(s0-0 (-> arg1 hal4-course spots 7))
@@ -1390,42 +1288,36 @@
(set! (-> v1-1 bytes 6) 7)
(set! (-> v1-1 bytes 4) 0)
(set! (-> (the-as halt-wait-spot v1-1) check-done)
(the-as (function halt-wait-spot hal symbol) (lambda ((arg0 object) (arg1 hal-escort))
(if (!= (level-status *level* 'ctyinda) 'active)
(set-time! (-> arg1 waypoint-time0))
)
(when (time-elapsed? (-> arg1 waypoint-time0) (seconds 0.25))
(let* ((v1-11 (-> arg1 actor-group 0 data 2 actor))
(s5-1 (when v1-11
(let ((s4-0 (-> v1-11 extra process)))
(if (type? s4-0 process-focusable)
s4-0
)
)
)
)
(v1-16 (-> arg1 actor-group 0 data 1 actor))
(s4-1 (when v1-16
(let ((s3-0 (-> v1-16 extra process)))
(if (type? s3-0 process-focusable)
s3-0
)
)
)
)
)
(send-event s5-1 'hide #f)
(send-event s4-1 'hide #f)
(send-event s5-1 'skip)
(send-event s4-1 'skip)
)
(ai-task-control-method-12 (-> arg1 ai-ctrl) arg1)
(go-to-waypoint! arg1 19 #f)
(ai-task-control-method-10 (-> arg1 ai-ctrl) arg1)
#t
)
)
(the-as
(function halt-wait-spot hal symbol)
(lambda ((arg0 object) (arg1 hal-escort))
(if (!= (level-status *level* 'ctyinda) 'active)
(set-time! (-> arg1 waypoint-time0))
)
(when (time-elapsed? (-> arg1 waypoint-time0) (seconds 0.25))
(let* ((v1-11 (-> arg1 actor-group 0 data 2 actor))
(s5-1 (if v1-11
(the-as process (as-type (-> v1-11 extra process) process-focusable))
)
)
(v1-16 (-> arg1 actor-group 0 data 1 actor))
(s4-1 (if v1-16
(the-as process (as-type (-> v1-16 extra process) process-focusable))
)
)
)
(send-event s5-1 'hide #f)
(send-event s4-1 'hide #f)
(send-event s5-1 'skip)
(send-event s4-1 'skip)
)
(ai-task-control-method-12 (-> arg1 ai-ctrl) arg1)
(go-to-waypoint! arg1 19 #f)
(ai-task-control-method-10 (-> arg1 ai-ctrl) arg1)
#t
)
)
)
)
)
(none)
@@ -1436,22 +1328,14 @@
(reset-warn-time! arg0)
(ai-task-control-method-12 (-> arg0 ai-ctrl) arg0)
(let* ((v1-10 (-> arg0 actor-group 0 data 2 actor))
(s5-0 (when v1-10
(let ((s4-0 (-> v1-10 extra process)))
(if (type? s4-0 process-focusable)
s4-0
)
(s5-0 (if v1-10
(the-as process (as-type (-> v1-10 extra process) process-focusable))
)
)
)
(v1-15 (-> arg0 actor-group 0 data 1 actor))
(s4-1 (when v1-15
(let ((s3-0 (-> v1-15 extra process)))
(if (type? s3-0 process-focusable)
s3-0
)
(s4-1 (if v1-15
(the-as process (as-type (-> v1-15 extra process) process-focusable))
)
)
)
)
(vector-reset! (-> (the-as process-focusable s5-0) root transv))
@@ -1502,22 +1386,14 @@
(return #t)
)
(let* ((v1-27 (-> arg1 actor-group 0 data 2 actor))
(s4-0 (when v1-27
(let ((s5-0 (-> v1-27 extra process)))
(if (type? s5-0 process-focusable)
s5-0
)
(s4-0 (if v1-27
(the-as process (as-type (-> v1-27 extra process) process-focusable))
)
)
)
(v1-32 (-> arg1 actor-group 0 data 1 actor))
(s5-1 (when v1-32
(let ((s3-0 (-> v1-32 extra process)))
(if (type? s3-0 process-focusable)
s3-0
)
(s5-1 (if v1-32
(the-as process (as-type (-> v1-32 extra process) process-focusable))
)
)
)
)
(when (and (and s4-0 (>= (the-as int (send-event s4-0 'query 'waypoint)) 25))
@@ -1548,22 +1424,14 @@
(send-event arg0 'move-trans (-> arg0 hal4-course spots 7))
(send-event *target* 'continue (get-continue-by-name *game-info* "lkiddoge-skip1"))
(let* ((v1-23 (-> arg0 actor-group 0 data 2 actor))
(s5-1 (when v1-23
(let ((s4-0 (-> v1-23 extra process)))
(if (type? s4-0 process-focusable)
s4-0
)
(s5-1 (if v1-23
(the-as process (as-type (-> v1-23 extra process) process-focusable))
)
)
)
(v1-28 (-> arg0 actor-group 0 data 1 actor))
(gp-1 (when v1-28
(let ((s4-1 (-> v1-28 extra process)))
(if (type? s4-1 process-focusable)
s4-1
)
(gp-1 (if v1-28
(the-as process (as-type (-> v1-28 extra process) process-focusable))
)
)
)
)
(send-event s5-1 'skip)
@@ -1609,22 +1477,14 @@
)
(when (not (hal-escort-method-230 arg1))
(let* ((v1-34 (-> arg1 actor-group 0 data 2 actor))
(s4-1 (when v1-34
(let ((s3-1 (-> v1-34 extra process)))
(if (type? s3-1 process-focusable)
s3-1
)
(s4-1 (if v1-34
(the-as process (as-type (-> v1-34 extra process) process-focusable))
)
)
)
(v1-39 (-> arg1 actor-group 0 data 1 actor))
(s3-2 (when v1-39
(let ((s2-0 (-> v1-39 extra process)))
(if (type? s2-0 process-focusable)
s2-0
)
(s3-2 (if v1-39
(the-as process (as-type (-> v1-39 extra process) process-focusable))
)
)
)
)
(when (and (process-grab? s4-1 #t)
@@ -1741,23 +1601,15 @@
(time-elapsed? (-> arg1 waypoint-time0) (seconds 1.2))
)
(let* ((v1-55 (-> arg1 actor-group 0 data 2 actor))
(s5-1 (when v1-55
(let ((s4-0 (-> v1-55 extra process)))
(if (type? s4-0 process-focusable)
s4-0
)
(s5-1 (if v1-55
(the-as process (as-type (-> v1-55 extra process) process-focusable))
)
)
)
)
(let* ((v1-60 (-> arg1 actor-group 0 data 1 actor))
(a0-16 (when v1-60
(let ((s4-1 (-> v1-60 extra process)))
(if (type? s4-1 process-focusable)
s4-1
)
(a0-16 (if v1-60
(the-as process (as-type (-> v1-60 extra process) process-focusable))
)
)
)
)
(logior! (-> arg1 waypoint-bits) (waypoint-bits wabits-0))
@@ -1832,13 +1684,9 @@
(when gp-0
(logior! (-> arg0 waypoint-bits) (waypoint-bits wabits-0))
(let* ((v1-8 (-> arg0 actor-group 0 data 1 actor))
(a0-3 (when v1-8
(let ((s5-1 (-> v1-8 extra process)))
(if (type? s5-1 process-focusable)
s5-1
)
(a0-3 (if v1-8
(the-as process (as-type (-> v1-8 extra process) process-focusable))
)
)
)
)
(send-event a0-3 'instant-arrest gp-0)
@@ -1907,13 +1755,9 @@
(remove-setting! 'music)
(remove-setting! 'sound-mode)
(let* ((v1-7 (-> arg0 actor-group 0 data 2 actor))
(a0-3 (when v1-7
(let ((s5-0 (-> v1-7 extra process)))
(if (type? s5-0 process-focusable)
s5-0
)
(a0-3 (if v1-7
(the-as process (as-type (-> v1-7 extra process) process-focusable))
)
)
)
)
(send-event a0-3 'request 'too-far-fail)
@@ -1970,13 +1814,9 @@
(when gp-0
(logior! (-> arg0 waypoint-bits) (waypoint-bits wabits-0))
(let* ((v1-8 (-> arg0 actor-group 0 data 1 actor))
(a0-3 (when v1-8
(let ((s5-1 (-> v1-8 extra process)))
(if (type? s5-1 process-focusable)
s5-1
)
(a0-3 (if v1-8
(the-as process (as-type (-> v1-8 extra process) process-focusable))
)
)
)
)
(send-event a0-3 'instant-arrest gp-0)
test/decompiler/reference/jak2/levels/city/kiddogescort/kidesc-states_REF.gc
Generated Vendored
+58 -98
View File
@@ -31,13 +31,9 @@
(go-waiting-turn self)
(b! #t cfg-15 :delay (nop!))
(label cfg-6)
(let ((gp-0 (handle->process (-> self arrestor-handle))))
(if (if (type? gp-0 process-focusable)
gp-0
)
(go-virtual arrested)
)
)
(if (the-as process (as-type (handle->process (-> self arrestor-handle)) process-focusable))
(go-virtual arrested)
)
(label cfg-15)
(when (not (focus-test? self grabbed))
(cond
@@ -100,14 +96,9 @@
(bot-method-223 self #f)
(when (not (focus-test? self grabbed))
(if (and (not (outside-spot-radius? self (the-as bot-spot #f) (the-as vector #f) #f))
(let ((gp-0 (handle->process (-> self arrestor-handle))))
(and (not (if (type? gp-0 process-focusable)
gp-0
)
)
(not (logtest? (-> self bot-flags) (bot-flags bf15)))
)
)
(and (not (the-as process (as-type (handle->process (-> self arrestor-handle)) process-focusable)))
(not (logtest? (-> self bot-flags) (bot-flags bf15)))
)
)
(go-virtual traveling)
)
@@ -152,26 +143,22 @@
)
:trans (behavior ()
(bot-method-223 self #f)
(let ((gp-0 (handle->process (-> self arrestor-handle))))
(cond
((if (type? gp-0 process-focusable)
gp-0
)
(go-virtual arrested)
)
((logtest? (-> self bot-flags) (bot-flags bf15))
(go-virtual move-to-vehicle)
)
((outside-spot-radius? self (the-as bot-spot #f) (the-as vector #f) #t)
(check-arrest self)
)
((and (time-elapsed? (-> self state-time) (seconds 0.5)) (bot-method-208 self))
(go-virtual traveling-blocked)
)
((and (nav-enemy-method-163 self) (time-elapsed? (-> self state-time) (-> self reaction-time)))
(go-stare2 self)
)
)
(cond
((the-as process (as-type (handle->process (-> self arrestor-handle)) process-focusable))
(go-virtual arrested)
)
((logtest? (-> self bot-flags) (bot-flags bf15))
(go-virtual move-to-vehicle)
)
((outside-spot-radius? self (the-as bot-spot #f) (the-as vector #f) #t)
(check-arrest self)
)
((and (time-elapsed? (-> self state-time) (seconds 0.5)) (bot-method-208 self))
(go-virtual traveling-blocked)
)
((and (nav-enemy-method-163 self) (time-elapsed? (-> self state-time) (-> self reaction-time)))
(go-stare2 self)
)
)
0
)
@@ -221,28 +208,24 @@
:trans (behavior ()
(bot-method-223 self #f)
(let ((gp-0 (handle->process (-> self vehicle-handle))))
(let ((s5-0 (handle->process (-> self arrestor-handle))))
(cond
((if (type? s5-0 process-focusable)
s5-0
)
(go-virtual arrested)
)
((or (not gp-0)
(logtest? (-> (the-as vehicle gp-0) flags) (rigid-body-object-flag dead))
(not (logtest? (-> self bot-flags) (bot-flags bf15)))
(< (-> self vehicle-seat-index) 0)
)
(logclear! (-> self bot-flags) (bot-flags bf15))
(check-arrest self)
)
((and (time-elapsed? (-> self state-time) (seconds 0.5)) (bot-method-208 self))
(go-virtual traveling-blocked)
)
((and (nav-enemy-method-163 self) (time-elapsed? (-> self state-time) (-> self reaction-time)))
(go-stare2 self)
)
)
(cond
((the-as process (as-type (handle->process (-> self arrestor-handle)) process-focusable))
(go-virtual arrested)
)
((or (not gp-0)
(logtest? (-> (the-as vehicle gp-0) flags) (rigid-body-object-flag dead))
(not (logtest? (-> self bot-flags) (bot-flags bf15)))
(< (-> self vehicle-seat-index) 0)
)
(logclear! (-> self bot-flags) (bot-flags bf15))
(check-arrest self)
)
((and (time-elapsed? (-> self state-time) (seconds 0.5)) (bot-method-208 self))
(go-virtual traveling-blocked)
)
((and (nav-enemy-method-163 self) (time-elapsed? (-> self state-time) (-> self reaction-time)))
(go-stare2 self)
)
)
(let ((s5-1 (new 'stack-no-clear 'inline-array 'matrix 2)))
(compute-seat-position (the-as vehicle gp-0) (the-as vector (-> s5-1 0)) (-> self vehicle-seat-index))
@@ -698,20 +681,16 @@
)
:trans (behavior ()
(bot-method-223 self #f)
(let ((gp-0 (handle->process (-> self arrestor-handle))))
(cond
((if (type? gp-0 process-focusable)
gp-0
)
(go-virtual arrested)
)
((and (time-elapsed? (-> self state-time) (seconds 1)) (not (bot-method-208 self)))
(if (logtest? (-> self bot-flags) (bot-flags bf15))
(go-virtual move-to-vehicle)
(go-virtual traveling)
)
)
)
(cond
((the-as process (as-type (handle->process (-> self arrestor-handle)) process-focusable))
(go-virtual arrested)
)
((and (time-elapsed? (-> self state-time) (seconds 1)) (not (bot-method-208 self)))
(if (logtest? (-> self bot-flags) (bot-flags bf15))
(go-virtual move-to-vehicle)
(go-virtual traveling)
)
)
)
)
:code (-> (method-of-type kid-escort waiting-idle) code)
@@ -735,13 +714,9 @@
)
:trans (behavior ()
(bot-method-223 self #f)
(let ((gp-0 (handle->process (-> self arrestor-handle))))
(if (if (type? gp-0 process-focusable)
gp-0
)
(go-virtual arrested)
)
)
(if (the-as process (as-type (handle->process (-> self arrestor-handle)) process-focusable))
(go-virtual arrested)
)
(when (time-elapsed? (-> self state-time) (seconds 0.1))
(when (not (nav-enemy-method-163 self))
(if (logtest? (-> self bot-flags) (bot-flags bf15))
@@ -845,14 +820,9 @@
(go-waiting-turn self)
)
(when (not (focus-test? self grabbed))
(let ((gp-0 (handle->process (-> self arrestor-handle))))
(if (not (if (type? gp-0 process-focusable)
gp-0
)
)
(react-to-focus self)
)
)
(if (not (the-as process (as-type (handle->process (-> self arrestor-handle)) process-focusable)))
(react-to-focus self)
)
)
)
)
@@ -862,12 +832,7 @@
(cond
((logtest? (bot-flags bf19) (-> self bot-flags))
(fail-mission! self)
(let* ((gp-0 (handle->process (-> self arrestor-handle)))
(v1-7 (if (type? gp-0 process-focusable)
gp-0
)
)
)
(let ((v1-7 (the-as process (as-type (handle->process (-> self arrestor-handle)) process-focusable))))
(if v1-7
(logclear! (-> (the-as crimson-guard v1-7) enemy-flags) (enemy-flag vulnerable vulnerable-backup))
)
@@ -902,12 +867,7 @@
#f
(label cfg-27)
(fail-mission! self)
(let* ((gp-1 (handle->process (-> self arrestor-handle)))
(v1-93 (if (type? gp-1 process-focusable)
gp-1
)
)
)
(let ((v1-93 (the-as process (as-type (handle->process (-> self arrestor-handle)) process-focusable))))
(if v1-93
(logclear! (-> (the-as crimson-guard v1-93) enemy-flags) (enemy-flag vulnerable vulnerable-backup))
)
test/decompiler/reference/jak2/levels/city/kiddogescort/kidesc4-course_REF.gc
Generated Vendored
+5 -30
View File
@@ -4,12 +4,7 @@
;; definition for function kid4-update-spot-to-track-crocadog
;; WARN: Return type mismatch float vs none.
(defun kid4-update-spot-to-track-crocadog ((arg0 kid-escort))
(let* ((s5-0 (handle->process (-> arg0 crocadog-handle)))
(a0-5 (if (type? s5-0 process-focusable)
s5-0
)
)
)
(let ((a0-5 (the-as process (as-type (handle->process (-> arg0 crocadog-handle)) process-focusable))))
(when a0-5
(let ((v1-4 (get-trans (the-as process-focusable a0-5) 0))
(a0-6 (-> arg0 spot))
@@ -101,12 +96,7 @@
(the-as
(function kidesct-wait-spot kid-escort symbol)
(lambda ((arg0 object) (arg1 kid-escort))
(let* ((s5-0 (handle->process (-> arg1 crocadog-handle)))
(a0-5 (if (type? s5-0 process-focusable)
s5-0
)
)
)
(let ((a0-5 (the-as process (as-type (handle->process (-> arg1 crocadog-handle)) process-focusable))))
(when (and a0-5 (>= (the-as int (send-event a0-5 'query 'waypoint)) 17))
(ai-task-control-method-12 (-> arg1 ai-ctrl) arg1)
(go-to-waypoint! arg1 17 #f)
@@ -137,12 +127,7 @@
(the-as
(function kidesct-wait-spot kid-escort symbol)
(lambda ((arg0 object) (arg1 kid-escort))
(let* ((s5-0 (handle->process (-> arg1 crocadog-handle)))
(a0-5 (if (type? s5-0 process-focusable)
s5-0
)
)
)
(let ((a0-5 (the-as process (as-type (handle->process (-> arg1 crocadog-handle)) process-focusable))))
(when (and a0-5 (>= (the-as int (send-event a0-5 'query 'waypoint)) 17))
(ai-task-control-method-12 (-> arg1 ai-ctrl) arg1)
(go-to-waypoint! arg1 17 #f)
@@ -242,12 +227,7 @@
(the-as
(function kidesct-wait-spot kid-escort symbol)
(lambda ((arg0 object) (arg1 kid-escort))
(let* ((s5-0 (handle->process (-> arg1 crocadog-handle)))
(a0-5 (if (type? s5-0 process-focusable)
s5-0
)
)
)
(let ((a0-5 (the-as process (as-type (handle->process (-> arg1 crocadog-handle)) process-focusable))))
(when (and a0-5 (>= (the-as int (send-event a0-5 'query 'waypoint)) 21))
(ai-task-control-method-12 (-> arg1 ai-ctrl) arg1)
(go-to-waypoint! arg1 21 #f)
@@ -290,12 +270,7 @@
(the-as
(function kidesct-wait-spot kid-escort symbol)
(lambda ((arg0 object) (arg1 kid-escort))
(let* ((s4-0 (handle->process (-> arg1 crocadog-handle)))
(s5-0 (if (type? s4-0 process-focusable)
s4-0
)
)
)
(let ((s5-0 (the-as process (as-type (handle->process (-> arg1 crocadog-handle)) process-focusable))))
(when (and (outside-spot-radius? arg1 (the-as bot-spot #f) (the-as vector #f) #f)
s5-0
(>= (the-as int (send-event s5-0 'query 'waypoint)) 25)
test/decompiler/reference/jak2/levels/city/kiddogescort/kidesc_REF.gc
Generated Vendored
+15 -42
View File
@@ -182,12 +182,7 @@
@TODO - unsure if there is a pattern for the events and this should have a more specific name"
(case arg2
(('arrest)
(let* ((s4-0 (handle->process (-> this arrestor-handle)))
(v1-4 (if (type? s4-0 process-focusable)
s4-0
)
)
)
(let ((v1-4 (the-as process (as-type (handle->process (-> this arrestor-handle)) process-focusable))))
(when (or (not v1-4) (= v1-4 arg0) (and (!= v1-4 arg0) (time-elapsed? (-> this arrest-attempt-time) (seconds 0.1))))
(set! (-> this arrestor-handle) (process->handle arg0))
(set-time! (-> this arrest-attempt-time))
@@ -241,17 +236,9 @@
;; definition for method 97 of type kid-escort
(defmethod enemy-method-97 ((this kid-escort))
(let* ((s4-0 (handle->process (-> this attacker-handle)))
(s5-0 (if (type? s4-0 process-focusable)
s4-0
)
)
(s3-0 (handle->process (-> this arrestor-handle)))
(s4-1 (if (type? s3-0 process-focusable)
s3-0
)
)
)
(let ((s5-0 (the-as process (as-type (handle->process (-> this attacker-handle)) process-focusable)))
(s4-1 (the-as process (as-type (handle->process (-> this arrestor-handle)) process-focusable)))
)
(when s5-0
(cond
((= (-> s5-0 type) target)
@@ -297,12 +284,7 @@
(empty)
)
(else
(let ((s5-1 (handle->process (-> this poi-handle))))
(set! s3-1 (if (type? s5-1 process-focusable)
s5-1
)
)
)
(set! s3-1 (the-as process (as-type (handle->process (-> this poi-handle)) process-focusable)))
(if s3-1
(empty)
(set! s3-1 *target*)
@@ -319,12 +301,7 @@
(set! s3-1 s5-0)
)
(else
(let ((s5-2 (handle->process (-> this poi-handle))))
(set! s3-1 (if (type? s5-2 process-focusable)
s5-2
)
)
)
(set! s3-1 (the-as process (as-type (handle->process (-> this poi-handle)) process-focusable)))
(cond
(s3-1
(empty)
@@ -531,19 +508,15 @@
;; definition for method 236 of type kid-escort
;; WARN: Return type mismatch object vs none.
(defmethod check-arrest ((this kid-escort))
(let ((s5-0 (handle->process (-> this arrestor-handle))))
(cond
((if (type? s5-0 process-focusable)
s5-0
)
(go (method-of-object this arrested))
)
((logtest? (-> this bot-flags) (bot-flags bf15))
(go (method-of-object this move-to-vehicle))
)
(else
(go (method-of-object this waiting-idle))
)
(cond
((the-as process (as-type (handle->process (-> this arrestor-handle)) process-focusable))
(go (method-of-object this arrested))
)
((logtest? (-> this bot-flags) (bot-flags bf15))
(go (method-of-object this move-to-vehicle))
)
(else
(go (method-of-object this waiting-idle))
)
)
(none)

Some files were not shown because too many files have changed in this diff Show More