mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-09-03 10:21:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

deftype and defmethod syntax major changes (#3094)

Browse Source 
Major change to how `deftype` shows up in our code:
- the decompiler will no longer emit the `offset-assert`,
`method-count-assert`, `size-assert` and `flag-assert` parameters. There
are extremely few cases where having this in the decompiled code is
helpful, as the types there come from `all-types` which already has
those parameters. This also doesn't break type consistency because:
  - the asserts aren't compared.
- the first step of the test uses `all-types`, which has the asserts,
which will throw an error if they're bad.
- the decompiler won't emit the `heap-base` parameter unless necessary
now.
- the decompiler will try its hardest to turn a fixed-offset field into
an `overlay-at` field. It falls back to the old offset if all else
fails.
- `overlay-at` now supports field "dereferencing" to specify the offset
that's within a field that's a structure, e.g.:
```lisp
(deftype foobar (structure)
  ((vec    vector  :inline)
   (flags  int32   :overlay-at (-> vec w))
   )
  )
```
in this structure, the offset of `flags` will be 12 because that is the
final offset of `vec`'s `w` field within this structure.
- **removed ID from all method declarations.** IDs are only ever
automatically assigned now. Fixes #3068.
- added an `:overlay` parameter to method declarations, in order to
declare a new method that goes on top of a previously-defined method.
Syntax is `:overlay <method-name>`. Please do not ever use this.
- added `state-methods` list parameter. This lets you quickly specify a
list of states to be put in the method table. Same syntax as the
`states` list parameter. The decompiler will try to put as many states
in this as it can without messing with the method ID order.

Also changes `defmethod` to make the first type definition (before the
arguments) optional. The type can now be inferred from the first
argument. Fixes #3093.

---------

Co-authored-by: Hat Kid <6624576+Hat-Kid@users.noreply.github.com>
This commit is contained in:
ManDude
2023-10-30 03:20:02 +00:00
committed by GitHub
parent 09536c68ac
commit cd68cb671e
2079 changed files with 94384 additions and 117066 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/decompiler/reference/jak2/engine/ui/bigmap-h_REF.gc
Generated Vendored
+96 -117
View File
@@ -3,15 +3,12 @@
;; definition of type bigmap-bit-mask
(deftype bigmap-bit-mask (structure)
((data uint8 6656 :offset-assert 0)
((data uint8 6656)
)
:method-count-assert 9
:size-assert #x1a00
:flag-assert #x900001a00
)
;; definition for method 3 of type bigmap-bit-mask
(defmethod inspect bigmap-bit-mask ((this bigmap-bit-mask))
(defmethod inspect ((this bigmap-bit-mask))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -24,15 +21,12 @@
;; definition of type bigmap-layer-mask
(deftype bigmap-layer-mask (structure)
((data uint8 26624 :offset-assert 0)
((data uint8 26624)
)
:method-count-assert 9
:size-assert #x6800
:flag-assert #x900006800
)
;; definition for method 3 of type bigmap-layer-mask
(defmethod inspect bigmap-layer-mask ((this bigmap-layer-mask))
(defmethod inspect ((this bigmap-layer-mask))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -45,18 +39,15 @@
;; definition of type bigmap-image
(deftype bigmap-image (structure)
((clut-offset uint32 :offset-assert 0)
(image-offset uint32 :offset-assert 4)
(pad uint32 2 :offset-assert 8)
(data uint8 1 :offset-assert 16)
((clut-offset uint32)
(image-offset uint32)
(pad uint32 2)
(data uint8 1)
)
:method-count-assert 9
:size-assert #x11
:flag-assert #x900000011
)
;; definition for method 3 of type bigmap-image
(defmethod inspect bigmap-image ((this bigmap-image))
(defmethod inspect ((this bigmap-image))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -72,17 +63,14 @@
;; definition of type bigmap-info
(deftype bigmap-info (vector)
((scale float :offset 8)
(inv-scale float :offset 12)
((scale float :overlay-at (-> data 2))
(inv-scale float :overlay-at (-> data 3))
)
:method-count-assert 9
:size-assert #x10
:flag-assert #x900000010
)
;; definition for method 3 of type bigmap-info
;; INFO: Used lq/sq
(defmethod inspect bigmap-info ((this bigmap-info))
(defmethod inspect ((this bigmap-info))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -102,15 +90,12 @@
;; definition of type bigmap-info-array
(deftype bigmap-info-array (structure)
((data bigmap-info 21 :inline :offset-assert 0)
((data bigmap-info 21 :inline)
)
:method-count-assert 9
:size-assert #x150
:flag-assert #x900000150
)
;; definition for method 3 of type bigmap-info-array
(defmethod inspect bigmap-info-array ((this bigmap-info-array))
(defmethod inspect ((this bigmap-info-array))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -123,35 +108,32 @@
;; definition of type bigmap-compressed-layers
(deftype bigmap-compressed-layers (structure)
((data (pointer uint32) 20 :offset-assert 0)
(layer0 (pointer uint32) :offset 0)
(layer1 (pointer uint32) :offset 4)
(layer2 (pointer uint32) :offset 8)
(layer3 (pointer uint32) :offset 12)
(layer4 (pointer uint32) :offset 16)
(layer5 (pointer uint32) :offset 20)
(layer6 (pointer uint32) :offset 24)
(layer7 (pointer uint32) :offset 28)
(layer8 (pointer uint32) :offset 32)
(layer9 (pointer uint32) :offset 36)
(layer10 (pointer uint32) :offset 40)
(layer11 (pointer uint32) :offset 44)
(layer12 (pointer uint32) :offset 48)
(layer13 (pointer uint32) :offset 52)
(layer14 (pointer uint32) :offset 56)
(layer15 (pointer uint32) :offset 60)
(layer16 (pointer uint32) :offset 64)
(layer17 (pointer uint32) :offset 68)
(layer18 (pointer uint32) :offset 72)
(layer19 (pointer uint32) :offset 76)
((data (pointer uint32) 20)
(layer0 (pointer uint32) :overlay-at (-> data 0))
(layer1 (pointer uint32) :overlay-at (-> data 1))
(layer2 (pointer uint32) :overlay-at (-> data 2))
(layer3 (pointer uint32) :overlay-at (-> data 3))
(layer4 (pointer uint32) :overlay-at (-> data 4))
(layer5 (pointer uint32) :overlay-at (-> data 5))
(layer6 (pointer uint32) :overlay-at (-> data 6))
(layer7 (pointer uint32) :overlay-at (-> data 7))
(layer8 (pointer uint32) :overlay-at (-> data 8))
(layer9 (pointer uint32) :overlay-at (-> data 9))
(layer10 (pointer uint32) :overlay-at (-> data 10))
(layer11 (pointer uint32) :overlay-at (-> data 11))
(layer12 (pointer uint32) :overlay-at (-> data 12))
(layer13 (pointer uint32) :overlay-at (-> data 13))
(layer14 (pointer uint32) :overlay-at (-> data 14))
(layer15 (pointer uint32) :overlay-at (-> data 15))
(layer16 (pointer uint32) :overlay-at (-> data 16))
(layer17 (pointer uint32) :overlay-at (-> data 17))
(layer18 (pointer uint32) :overlay-at (-> data 18))
(layer19 (pointer uint32) :overlay-at (-> data 19))
)
:method-count-assert 9
:size-assert #x50
:flag-assert #x900000050
)
;; definition for method 3 of type bigmap-compressed-layers
(defmethod inspect bigmap-compressed-layers ((this bigmap-compressed-layers))
(defmethod inspect ((this bigmap-compressed-layers))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -184,75 +166,72 @@
;; definition of type bigmap
(deftype bigmap (basic)
((drawing-flag symbol :offset-assert 4)
(loading-flag symbol :offset-assert 8)
(recording-flag symbol :offset-assert 12)
(fill-flag symbol :offset-assert 16)
(bigmap-index uint32 :offset-assert 20)
(bigmap-image external-art-buffer :offset-assert 24)
(tpage external-art-buffer :offset-assert 28)
(progress-minimap texture-page :offset-assert 32)
(mask-index uint32 :offset-assert 36)
(bit-mask bigmap-bit-mask :offset-assert 40)
(compressed-next-index uint32 :offset-assert 44)
(max-next-index uint32 :offset-assert 48)
(compressed-masks (pointer int8) 20 :offset-assert 52)
(compressed-data uint32 :offset-assert 132)
(layer-index uint32 :offset-assert 136)
(layer-mask bigmap-layer-mask :offset-assert 140)
(compressed-layers bigmap-compressed-layers :offset-assert 144)
(layer-mask-enable uint32 :offset-assert 148)
(load-index uint32 :offset-assert 152)
(x0 int32 :offset-assert 156)
(y0 int32 :offset-assert 160)
(x1 int32 :offset-assert 164)
(y1 int32 :offset-assert 168)
(y2 int32 :offset-assert 172)
(goal-time float :offset-assert 176)
(sprite-tmpl dma-gif-packet :inline :offset-assert 192)
(draw-tmpl dma-gif-packet :inline :offset-assert 224)
(adgif-tmpl dma-gif-packet :inline :offset-assert 256)
(offset vector :inline :offset-assert 288)
(size float :offset 296)
(scale float :offset 300)
(draw-offset vector :inline :offset-assert 304)
(draw-size float :offset 312)
(draw-scale float :offset 316)
(scroll vector :inline :offset-assert 320)
(pos vector4w :inline :offset-assert 336)
(color vector4w :inline :offset-assert 352)
(corner vector 4 :inline :offset-assert 368)
(auto-save-icon-flag symbol :offset-assert 432)
((drawing-flag symbol)
(loading-flag symbol)
(recording-flag symbol)
(fill-flag symbol)
(bigmap-index uint32)
(bigmap-image external-art-buffer)
(tpage external-art-buffer)
(progress-minimap texture-page)
(mask-index uint32)
(bit-mask bigmap-bit-mask)
(compressed-next-index uint32)
(max-next-index uint32)
(compressed-masks (pointer int8) 20)
(compressed-data uint32)
(layer-index uint32)
(layer-mask bigmap-layer-mask)
(compressed-layers bigmap-compressed-layers)
(layer-mask-enable uint32)
(load-index uint32)
(x0 int32)
(y0 int32)
(x1 int32)
(y1 int32)
(y2 int32)
(goal-time float)
(sprite-tmpl dma-gif-packet :inline)
(draw-tmpl dma-gif-packet :inline)
(adgif-tmpl dma-gif-packet :inline)
(offset vector :inline)
(size float :overlay-at (-> offset data 2))
(scale float :overlay-at (-> offset data 3))
(draw-offset vector :inline)
(draw-size float :overlay-at (-> draw-offset data 2))
(draw-scale float :overlay-at (-> draw-offset data 3))
(scroll vector :inline)
(pos vector4w :inline)
(color vector4w :inline)
(corner vector 4 :inline)
(auto-save-icon-flag symbol)
)
:method-count-assert 28
:size-assert #x1b4
:flag-assert #x1c000001b4
(:methods
(new (symbol type) _type_ 0)
(initialize (_type_) none 9)
(update (_type_) none 10)
(draw (_type_ int int int int) int 11)
(handle-cpad-inputs (_type_) int 12)
(compress-all (_type_) int 13)
(enable-drawing (_type_) none 14)
(disable-drawing (_type_) int 15)
(dump-to-file (_type_) file-stream 16)
(set-pos! (_type_ vector) int 17)
(decompress-current-masks! (_type_) int 18)
(compress-current-masks! (_type_) int 19)
(set-enable-from-position! (_type_) int 20)
(maybe-fill-for-position (_type_ int int) int 21)
(texture-upload-dma (_type_ dma-buffer (pointer uint32) int int int gs-psm) none 22)
(mask-image-from-bit-mask (_type_) none 23)
(draw-non-city-map (_type_ dma-buffer) none 24)
(draw-city-map (_type_ dma-buffer) none 25)
(sprite-dma (_type_ dma-buffer int int int int) none 26)
(draw-from-minimap (_type_ dma-buffer connection-minimap) int 27)
(new (symbol type) _type_)
(initialize (_type_) none)
(update (_type_) none)
(draw (_type_ int int int int) int)
(handle-cpad-inputs (_type_) int)
(compress-all (_type_) int)
(enable-drawing (_type_) none)
(disable-drawing (_type_) int)
(dump-to-file (_type_) file-stream)
(set-pos! (_type_ vector) int)
(decompress-current-masks! (_type_) int)
(compress-current-masks! (_type_) int)
(set-enable-from-position! (_type_) int)
(maybe-fill-for-position (_type_ int int) int)
(texture-upload-dma (_type_ dma-buffer (pointer uint32) int int int gs-psm) none)
(mask-image-from-bit-mask (_type_) none)
(draw-non-city-map (_type_ dma-buffer) none)
(draw-city-map (_type_ dma-buffer) none)
(sprite-dma (_type_ dma-buffer int int int int) none)
(draw-from-minimap (_type_ dma-buffer connection-minimap) int)
)
)
;; definition for method 3 of type bigmap
(defmethod inspect bigmap ((this bigmap))
(defmethod inspect ((this bigmap))
(when (not this)
(set! this this)
(goto cfg-4)
test/decompiler/reference/jak2/engine/ui/bigmap_REF.gc
Generated Vendored
+19 -19
View File
@@ -2,7 +2,7 @@
(in-package goal)
;; definition for method 17 of type bigmap
(defmethod set-pos! bigmap ((this bigmap) (arg0 vector))
(defmethod set-pos! ((this bigmap) (arg0 vector))
(rlet ((vf0 :class vf)
(vf1 :class vf)
(vf2 :class vf)
@@ -21,7 +21,7 @@
;; definition for method 18 of type bigmap
;; INFO: Used lq/sq
(defmethod decompress-current-masks! bigmap ((this bigmap))
(defmethod decompress-current-masks! ((this bigmap))
(let ((compressed-mask-data (-> this compressed-masks (-> this mask-index))))
(set! (-> this compressed-masks (-> this mask-index)) (the-as (pointer int8) #f))
(cond
@@ -62,7 +62,7 @@
)
;; definition for method 19 of type bigmap
(defmethod compress-current-masks! bigmap ((this bigmap))
(defmethod compress-current-masks! ((this bigmap))
(let* ((compressed-data-dest (+ (-> this compressed-next-index) 0 (-> this compressed-data)))
(compressed-data-size
(pack-comp-rle
@@ -143,7 +143,7 @@
)
;; definition for method 20 of type bigmap
(defmethod set-enable-from-position! bigmap ((this bigmap))
(defmethod set-enable-from-position! ((this bigmap))
(let ((v1-4 (-> this layer-mask data (+ (* (-> this pos y) 128) (/ (-> this pos x) 2)))))
(if (not (logtest? (-> this pos x) 1))
(set! (-> this layer-mask-enable) (shr v1-4 4))
@@ -154,7 +154,7 @@
)
;; definition for method 21 of type bigmap
(defmethod maybe-fill-for-position bigmap ((this bigmap) (arg0 int) (arg1 int))
(defmethod maybe-fill-for-position ((this bigmap) (arg0 int) (arg1 int))
(local-vars (v1-3 uint))
(let* ((v1-1 (+ (* arg1 128) (/ arg0 2)))
(a3-3 (-> this layer-mask data v1-1))
@@ -198,7 +198,7 @@
;; definition for method 23 of type bigmap
;; WARN: Return type mismatch int vs none.
(defmethod mask-image-from-bit-mask bigmap ((this bigmap))
(defmethod mask-image-from-bit-mask ((this bigmap))
(let* ((v1-0 (the-as object (-> this bit-mask)))
(a1-0 *image-mask-table*)
(a0-2 (the-as object (-> this bigmap-image art-group)))
@@ -233,7 +233,7 @@
;; definition for method 22 of type bigmap
;; WARN: Return type mismatch int vs none.
(defmethod texture-upload-dma bigmap ((this bigmap) (arg0 dma-buffer) (arg1 (pointer uint32)) (arg2 int) (arg3 int) (arg4 int) (arg5 gs-psm))
(defmethod texture-upload-dma ((this bigmap) (arg0 dma-buffer) (arg1 (pointer uint32)) (arg2 int) (arg3 int) (arg4 int) (arg5 gs-psm))
(local-vars (sv-16 int))
(set! sv-16 arg2)
(dma-buffer-add-gs-set arg0
@@ -250,7 +250,7 @@
;; definition for method 26 of type bigmap
;; INFO: Used lq/sq
;; WARN: Return type mismatch pointer vs none.
(defmethod sprite-dma bigmap ((this bigmap) (arg0 dma-buffer) (arg1 int) (arg2 int) (arg3 int) (arg4 int))
(defmethod sprite-dma ((this bigmap) (arg0 dma-buffer) (arg1 int) (arg2 int) (arg3 int) (arg4 int))
(let ((v1-0 (-> arg0 base)))
(set! (-> (the-as (pointer uint128) v1-0) 0) (-> this sprite-tmpl dma-vif quad))
(set! (-> (the-as (pointer uint128) v1-0) 1) (-> this sprite-tmpl quad 1))
@@ -265,7 +265,7 @@
)
;; definition for method 24 of type bigmap
(defmethod draw-non-city-map bigmap ((this bigmap) (arg0 dma-buffer))
(defmethod draw-non-city-map ((this bigmap) (arg0 dma-buffer))
(let ((s4-0 (the-as (pointer uint32) (-> this bigmap-image art-group))))
(let ((v1-1 (-> s4-0 0))
(s3-0 (-> s4-0 1))
@@ -307,7 +307,7 @@
)
;; definition for method 25 of type bigmap
(defmethod draw-city-map bigmap ((this bigmap) (arg0 dma-buffer))
(defmethod draw-city-map ((this bigmap) (arg0 dma-buffer))
(let ((s4-0 (the-as (pointer uint32) (-> this bigmap-image art-group))))
(texture-upload-dma this arg0 (+ (+ (-> s4-0 0) 16) (the-as uint s4-0)) 0 16 16 (gs-psm ct32))
(dma-buffer-add-gs-set arg0 (texflush 0))
@@ -331,7 +331,7 @@
;; definition for method 27 of type bigmap
;; INFO: Used lq/sq
(defmethod draw-from-minimap bigmap ((this bigmap) (arg0 dma-buffer) (arg1 connection-minimap))
(defmethod draw-from-minimap ((this bigmap) (arg0 dma-buffer) (arg1 connection-minimap))
(rlet ((vf0 :class vf)
(vf1 :class vf)
(vf2 :class vf)
@@ -446,7 +446,7 @@
;; definition for method 9 of type bigmap
;; WARN: Return type mismatch int vs none.
(defmethod initialize bigmap ((this bigmap))
(defmethod initialize ((this bigmap))
(set! (-> this bigmap-index) (the-as uint 20))
(set-pending-file (-> this bigmap-image) (the-as string #f) 0 (process->handle *dproc*) 0.0)
(set! (-> this compressed-next-index) (the-as uint 0))
@@ -464,7 +464,7 @@
;; definition for method 10 of type bigmap
;; INFO: Used lq/sq
;; WARN: Return type mismatch int vs none.
(defmethod update bigmap ((this bigmap))
(defmethod update ((this bigmap))
(let ((v1-1 (level-get-target-inside *level*)))
(if v1-1
(set! (-> this bigmap-index) (the-as uint (-> v1-1 info bigmap-id)))
@@ -585,7 +585,7 @@
;; definition for method 11 of type bigmap
;; INFO: Used lq/sq
(defmethod draw bigmap ((this bigmap) (arg0 int) (arg1 int) (arg2 int) (arg3 int))
(defmethod draw ((this bigmap) (arg0 int) (arg1 int) (arg2 int) (arg3 int))
(local-vars (sv-96 pointer) (sv-100 texture) (sv-104 matrix) (sv-112 int))
(when (and (= (file-status (-> this bigmap-image) "world-map" (the-as int (-> this load-index))) 'active)
(not (-> this loading-flag))
@@ -747,7 +747,7 @@
;; definition for method 12 of type bigmap
;; INFO: Used lq/sq
(defmethod handle-cpad-inputs bigmap ((this bigmap))
(defmethod handle-cpad-inputs ((this bigmap))
(cond
((= (-> this bigmap-index) 20)
(let* ((v1-2 (-> *cpad-list* cpads 0))
@@ -765,7 +765,7 @@
)
;; definition for method 13 of type bigmap
(defmethod compress-all bigmap ((this bigmap))
(defmethod compress-all ((this bigmap))
(when (!= (-> this mask-index) 20)
(compress-current-masks! this)
(set! (-> this mask-index) (the-as uint 20))
@@ -776,7 +776,7 @@
;; definition for method 14 of type bigmap
;; INFO: Used lq/sq
;; WARN: Return type mismatch symbol vs none.
(defmethod enable-drawing bigmap ((this bigmap))
(defmethod enable-drawing ((this bigmap))
(set! (-> this bigmap-index) (the-as uint (-> (level-get-target-inside *level*) info bigmap-id)))
(cond
((= (-> this bigmap-index) 20)
@@ -818,7 +818,7 @@
)
;; definition for method 15 of type bigmap
(defmethod disable-drawing bigmap ((this bigmap))
(defmethod disable-drawing ((this bigmap))
(set-pending-file
(-> this bigmap-image)
(the-as string #f)
@@ -848,7 +848,7 @@
(define *map-save-ptr* (the-as (pointer uint64) #f))
;; definition for method 16 of type bigmap
(defmethod dump-to-file bigmap ((this bigmap))
(defmethod dump-to-file ((this bigmap))
(if (not *map-save-ptr*)
(set! *map-save-ptr* (the-as (pointer uint64) (malloc 'debug #xd0000)))
)
test/decompiler/reference/jak2/engine/ui/gui-h_REF.gc
Generated Vendored
+40 -46
View File
@@ -3,29 +3,26 @@
;; definition of type gui-connection
(deftype gui-connection (connection)
((priority float :offset 16)
(action gui-action :offset 20)
(channel gui-channel :offset 21)
(anim-part uint8 :offset 22)
(flags gui-connection-flags :offset 23)
(name string :offset 24)
(id sound-id :offset 28)
(handle handle :offset 0)
(time-stamp time-frame :offset 8)
(hold-time time-frame :offset-assert 32)
(fo-min int16 :offset-assert 40)
(fo-max int16 :offset-assert 42)
(fo-curve int8 :offset-assert 44)
(fade uint8 :offset-assert 45)
(pad uint8 2 :offset-assert 46)
((priority float :overlay-at param0)
(action gui-action :overlay-at param1)
(channel gui-channel :offset 21)
(anim-part uint8 :offset 22)
(flags gui-connection-flags :offset 23)
(name string :overlay-at param2)
(id sound-id :overlay-at param3)
(handle handle :overlay-at next0)
(time-stamp time-frame :overlay-at next1)
(hold-time time-frame)
(fo-min int16)
(fo-max int16)
(fo-curve int8)
(fade uint8)
(pad uint8 2)
)
:method-count-assert 14
:size-assert #x30
:flag-assert #xe00000030
)
;; definition for method 3 of type gui-connection
(defmethod inspect gui-connection ((this gui-connection))
(defmethod inspect ((this gui-connection))
(when (not this)
(set! this this)
(goto cfg-116)
@@ -249,35 +246,32 @@
;; definition of type gui-control
(deftype gui-control (basic)
((engine engine :offset-assert 4)
(update-time time-frame :offset-assert 8)
(connections gui-connection 32 :inline :offset-assert 16)
(spool-connections gui-connection 4 :inline :offset-assert 1552)
(ids sound-id 96 :offset-assert 1744)
(times time-frame 96 :offset-assert 2128)
(cmd pair 96 :offset-assert 2896)
((engine engine)
(update-time time-frame)
(connections gui-connection 32 :inline)
(spool-connections gui-connection 4 :inline)
(ids sound-id 96)
(times time-frame 96)
(cmd pair 96)
)
:method-count-assert 25
:size-assert #xcd0
:flag-assert #x1900000cd0
(:methods
(new (symbol type int) _type_ 0)
(add-process (_type_ process gui-channel gui-action string float time-frame) sound-id 9)
(remove-process (_type_ process gui-channel) none 10)
(stop-str (_type_ gui-connection) int 11)
(gui-control-method-12 (_type_ process gui-channel gui-action string int float sound-id) sound-id 12)
(update (_type_ symbol) int 13)
(lookup-gui-connection-id (_type_ string gui-channel gui-action) sound-id 14)
(lookup-gui-connection (_type_ process gui-channel string sound-id) gui-connection 15)
(set-action! (_type_ gui-action sound-id gui-channel gui-action string (function gui-connection symbol) process) int 16)
(get-status (_type_ sound-id) gui-status 17)
(gui-control-method-18 (_type_ gui-channel) symbol 18)
(handle-command-list (_type_ gui-channel gui-connection) symbol 19)
(set-falloff! (_type_ sound-id symbol int int int) gui-connection 20)
(gui-control-method-21 (_type_ gui-connection vector) int 21)
(gui-control-method-22 (_type_ gui-connection process symbol) none 22)
(handle-command (_type_ gui-channel gui-channel symbol gui-connection) symbol 23)
(channel-id-set! (_type_ gui-connection sound-id) int 24)
(new (symbol type int) _type_)
(add-process (_type_ process gui-channel gui-action string float time-frame) sound-id)
(remove-process (_type_ process gui-channel) none)
(stop-str (_type_ gui-connection) int)
(gui-control-method-12 (_type_ process gui-channel gui-action string int float sound-id) sound-id)
(update (_type_ symbol) int)
(lookup-gui-connection-id (_type_ string gui-channel gui-action) sound-id)
(lookup-gui-connection (_type_ process gui-channel string sound-id) gui-connection)
(set-action! (_type_ gui-action sound-id gui-channel gui-action string (function gui-connection symbol) process) int)
(get-status (_type_ sound-id) gui-status)
(gui-control-method-18 (_type_ gui-channel) symbol)
(handle-command-list (_type_ gui-channel gui-connection) symbol)
(set-falloff! (_type_ sound-id symbol int int int) gui-connection)
(gui-control-method-21 (_type_ gui-connection vector) int)
(gui-control-method-22 (_type_ gui-connection process symbol) none)
(handle-command (_type_ gui-channel gui-channel symbol gui-connection) symbol)
(channel-id-set! (_type_ gui-connection sound-id) int)
)
)
test/decompiler/reference/jak2/engine/ui/hud-classes_REF.gc
Generated Vendored
+40 -40
View File
@@ -3,7 +3,7 @@
;; definition for method 15 of type hud-map
;; WARN: Return type mismatch int vs none.
(defmethod draw hud-map ((this hud-map))
(defmethod draw ((this hud-map))
(set-hud-piece-position!
(-> this sprites 1)
(the int (+ 492.0 (* 140.0 (-> this offset))))
@@ -106,7 +106,7 @@
;; definition for method 16 of type hud-map
;; WARN: Return type mismatch int vs none.
(defmethod update-values hud-map ((this hud-map))
(defmethod update-values ((this hud-map))
(cond
((update! *minimap*)
(logior! (-> this flags) (hud-flags show))
@@ -134,7 +134,7 @@
;; definition for method 17 of type hud-map
;; WARN: Return type mismatch int vs none.
(defmethod init-callback hud-map ((this hud-map))
(defmethod init-callback ((this hud-map))
(set! (-> this gui-id)
(add-process *gui-control* this (gui-channel hud-lower-right) (gui-action hidden) (-> this name) 81920.0 0)
)
@@ -156,7 +156,7 @@
;; definition for method 15 of type hud-health
;; WARN: Return type mismatch int vs none.
(defmethod draw hud-health ((this hud-health))
(defmethod draw ((this hud-health))
(set-hud-piece-position!
(-> this sprites 8)
(the int (+ (* -130.0 (-> this offset)) (if (= (-> *setting-control* user-default aspect-ratio) 'aspect4x3)
@@ -256,7 +256,7 @@
;; definition for method 16 of type hud-health
;; WARN: Return type mismatch int vs none.
(defmethod update-values hud-health ((this hud-health))
(defmethod update-values ((this hud-health))
(set! (-> this values 0 target) (the int (* 10.0 (-> *target* fact health))))
(set! (-> this values 1 target) (the-as int (-> *target* fact health-pickup-time)))
(set! (-> this values 2 target) (mod (the int (+ 0.5 (-> *target* game eco-pill-dark))) 100))
@@ -271,7 +271,7 @@
;; definition for method 17 of type hud-health
;; WARN: Return type mismatch int vs none.
(defmethod init-callback hud-health ((this hud-health))
(defmethod init-callback ((this hud-health))
(set! (-> this gui-id)
(add-process *gui-control* this (gui-channel hud-lower-left-1) (gui-action hidden) (-> this name) 81920.0 0)
)
@@ -344,7 +344,7 @@
;; definition for method 15 of type hud-dark-eco-symbol
;; WARN: Return type mismatch int vs none.
(defmethod draw hud-dark-eco-symbol ((this hud-dark-eco-symbol))
(defmethod draw ((this hud-dark-eco-symbol))
(let ((v1-0 (process-by-name "hud-health" *active-pool*))
(f30-0 (-> this offset))
)
@@ -406,7 +406,7 @@
;; definition for method 16 of type hud-dark-eco-symbol
;; WARN: Return type mismatch int vs none.
(defmethod update-values hud-dark-eco-symbol ((this hud-dark-eco-symbol))
(defmethod update-values ((this hud-dark-eco-symbol))
(set! (-> this values 0 target) (the int (* 10.0 (-> *target* fact health))))
(set! (-> this values 1 target) (the-as int (-> *target* fact health-pickup-time)))
(set! (-> this values 2 target) (mod (the int (+ 0.5 (-> *target* game eco-pill-dark))) 100))
@@ -428,7 +428,7 @@
;; definition for method 17 of type hud-dark-eco-symbol
;; WARN: Return type mismatch int vs none.
(defmethod init-callback hud-dark-eco-symbol ((this hud-dark-eco-symbol))
(defmethod init-callback ((this hud-dark-eco-symbol))
(set! (-> this gui-id)
(add-process *gui-control* this (gui-channel hud-lower-left-2) (gui-action hidden) (-> this name) 81920.0 0)
)
@@ -444,7 +444,7 @@
;; definition for method 15 of type hud-skullgem
;; WARN: Return type mismatch int vs none.
(defmethod draw hud-skullgem ((this hud-skullgem))
(defmethod draw ((this hud-skullgem))
(set-hud-piece-position!
(the-as hud-sprite (-> this icons 0 pos))
(the int (+ 60.0 (* -130.0 (-> this offset))))
@@ -473,7 +473,7 @@
;; definition for method 16 of type hud-skullgem
;; WARN: Return type mismatch int vs none.
(defmethod update-values hud-skullgem ((this hud-skullgem))
(defmethod update-values ((this hud-skullgem))
(set! (-> this values 0 target) (the int (-> *target* game gem)))
((method-of-type hud update-values) this)
0
@@ -482,7 +482,7 @@
;; definition for method 17 of type hud-skullgem
;; WARN: Return type mismatch int vs none.
(defmethod init-callback hud-skullgem ((this hud-skullgem))
(defmethod init-callback ((this hud-skullgem))
(set! (-> this gui-id)
(add-process *gui-control* this (gui-channel hud-center-left) (gui-action hidden) (-> this name) 81920.0 0)
)
@@ -502,7 +502,7 @@
;; definition for method 15 of type hud-skill
;; WARN: Return type mismatch int vs none.
(defmethod draw hud-skill ((this hud-skill))
(defmethod draw ((this hud-skill))
(set-hud-piece-position!
(the-as hud-sprite (-> this icons 0 pos))
(the int (+ 60.0 (* -130.0 (-> this offset))))
@@ -537,7 +537,7 @@
;; definition for method 16 of type hud-skill
;; WARN: Return type mismatch int vs none.
(defmethod update-values hud-skill ((this hud-skill))
(defmethod update-values ((this hud-skill))
(set! (-> this values 0 target) (the int (-> *target* game skill)))
((method-of-type hud update-values) this)
0
@@ -546,7 +546,7 @@
;; definition for method 17 of type hud-skill
;; WARN: Return type mismatch int vs none.
(defmethod init-callback hud-skill ((this hud-skill))
(defmethod init-callback ((this hud-skill))
(set! (-> this gui-id)
(add-process *gui-control* this (gui-channel hud-middle-left) (gui-action hidden) (-> this name) 81920.0 0)
)
@@ -571,7 +571,7 @@
;; definition for method 25 of type hud-skill
;; WARN: Return type mismatch int vs none.
(defmethod update-value-callback hud-skill ((this hud-skill) (arg0 int) (arg1 int))
(defmethod update-value-callback ((this hud-skill) (arg0 int) (arg1 int))
(if (> arg1 0)
(sound-play "skill-pickup" :pitch 0.5)
)
@@ -581,7 +581,7 @@
;; definition for method 15 of type hud-score
;; WARN: Return type mismatch int vs none.
(defmethod draw hud-score ((this hud-score))
(defmethod draw ((this hud-score))
(set-hud-piece-position!
(the-as hud-sprite (-> this sprites))
(the int (+ 480.0 (* 130.0 (-> this offset))))
@@ -596,7 +596,7 @@
;; definition for method 16 of type hud-score
;; WARN: Return type mismatch int vs none.
(defmethod update-values hud-score ((this hud-score))
(defmethod update-values ((this hud-score))
(set! (-> this values 0 target) (the int (-> *game-info* score)))
((method-of-type hud update-values) this)
0
@@ -605,7 +605,7 @@
;; definition for method 17 of type hud-score
;; WARN: Return type mismatch int vs none.
(defmethod init-callback hud-score ((this hud-score))
(defmethod init-callback ((this hud-score))
(set! (-> this gui-id)
(add-process *gui-control* this (gui-channel hud-center-right) (gui-action hidden) (-> this name) 81920.0 0)
)
@@ -623,7 +623,7 @@
;; definition for method 15 of type hud-timer
;; WARN: Return type mismatch int vs none.
(defmethod draw hud-timer ((this hud-timer))
(defmethod draw ((this hud-timer))
(set-hud-piece-position!
(the-as hud-sprite (-> this sprites))
264
@@ -663,7 +663,7 @@
;; definition for method 16 of type hud-timer
;; WARN: Return type mismatch int vs none.
(defmethod update-values hud-timer ((this hud-timer))
(defmethod update-values ((this hud-timer))
(set! (-> this values 0 target) (/ (-> *game-info* timer) #x4650))
(set! (-> this values 1 target) (/ (mod (-> *game-info* timer) #x4650) 300))
(let ((v1-8 (abs (- (-> this values 1 target) (-> this values 2 target)))))
@@ -683,7 +683,7 @@
;; definition for method 17 of type hud-timer
;; WARN: Return type mismatch int vs none.
(defmethod init-callback hud-timer ((this hud-timer))
(defmethod init-callback ((this hud-timer))
(set! (-> this gui-id)
(add-process *gui-control* this (gui-channel hud-upper-center) (gui-action hidden) (-> this name) 81920.0 0)
)
@@ -705,7 +705,7 @@
;; definition for method 15 of type hud-big-score
;; WARN: Return type mismatch int vs none.
(defmethod draw hud-big-score ((this hud-big-score))
(defmethod draw ((this hud-big-score))
(set-hud-piece-position!
(the-as hud-sprite (-> this sprites))
264
@@ -720,7 +720,7 @@
;; definition for method 16 of type hud-big-score
;; WARN: Return type mismatch int vs none.
(defmethod update-values hud-big-score ((this hud-big-score))
(defmethod update-values ((this hud-big-score))
(set! (-> this values 0 target) (the int (-> *game-info* score)))
((method-of-type hud update-values) this)
0
@@ -729,7 +729,7 @@
;; definition for method 17 of type hud-big-score
;; WARN: Return type mismatch int vs none.
(defmethod init-callback hud-big-score ((this hud-big-score))
(defmethod init-callback ((this hud-big-score))
(set! (-> this gui-id)
(add-process *gui-control* this (gui-channel hud-upper-center) (gui-action hidden) (-> this name) 81920.0 0)
)
@@ -748,7 +748,7 @@
;; definition for method 15 of type hud-goal
;; WARN: Return type mismatch int vs none.
(defmethod draw hud-goal ((this hud-goal))
(defmethod draw ((this hud-goal))
(set-hud-piece-position!
(the-as hud-sprite (-> this sprites))
(the int (+ 65.0 (* -130.0 (-> this offset))))
@@ -764,7 +764,7 @@
;; definition for method 16 of type hud-goal
;; WARN: Return type mismatch int vs none.
(defmethod update-values hud-goal ((this hud-goal))
(defmethod update-values ((this hud-goal))
(set! (-> this values 0 target) (the int (-> *game-info* goal)))
((method-of-type hud update-values) this)
0
@@ -773,7 +773,7 @@
;; definition for method 17 of type hud-goal
;; WARN: Return type mismatch int vs none.
(defmethod init-callback hud-goal ((this hud-goal))
(defmethod init-callback ((this hud-goal))
(set! (-> this gui-id)
(add-process *gui-control* this (gui-channel hud-upper-left) (gui-action hidden) (-> this name) 81920.0 0)
)
@@ -802,7 +802,7 @@
;; definition for method 15 of type hud-miss
;; WARN: Return type mismatch int vs none.
(defmethod draw hud-miss ((this hud-miss))
(defmethod draw ((this hud-miss))
(set-hud-piece-position!
(the-as hud-sprite (-> this sprites))
(the int (+ 448.0 (* 130.0 (-> this offset))))
@@ -825,7 +825,7 @@
;; definition for method 16 of type hud-miss
;; WARN: Return type mismatch int vs none.
(defmethod update-values hud-miss ((this hud-miss))
(defmethod update-values ((this hud-miss))
(set! (-> this values 0 target) (the int (-> *game-info* miss)))
(set! (-> this values 1 target) (the int (-> *game-info* miss-max)))
((method-of-type hud update-values) this)
@@ -835,7 +835,7 @@
;; definition for method 17 of type hud-miss
;; WARN: Return type mismatch int vs none.
(defmethod init-callback hud-miss ((this hud-miss))
(defmethod init-callback ((this hud-miss))
(set! (-> this gui-id)
(add-process *gui-control* this (gui-channel hud-upper-right) (gui-action hidden) (-> this name) 81920.0 0)
)
@@ -857,7 +857,7 @@
;; definition for method 15 of type hud-progress
;; WARN: Return type mismatch int vs none.
(defmethod draw hud-progress ((this hud-progress))
(defmethod draw ((this hud-progress))
(with-pp
(let ((f0-0 (if (process-by-name "hud-timer" *active-pool*)
65.0
@@ -886,7 +886,7 @@
;; definition for method 16 of type hud-progress
;; WARN: Return type mismatch int vs none.
(defmethod update-values hud-progress ((this hud-progress))
(defmethod update-values ((this hud-progress))
(set! (-> this values 0 target) (the int (* 1000.0 (-> *game-info* distance))))
(logclear! (-> this flags) (hud-flags disable))
((method-of-type hud update-values) this)
@@ -896,7 +896,7 @@
;; definition for method 17 of type hud-progress
;; WARN: Return type mismatch int vs none.
(defmethod init-callback hud-progress ((this hud-progress))
(defmethod init-callback ((this hud-progress))
(set! (-> this gui-id)
(add-process *gui-control* this (gui-channel hud-upper-center-2) (gui-action hidden) (-> this name) 81920.0 0)
)
@@ -921,7 +921,7 @@
;; definition for method 15 of type hud-gun
;; INFO: Used lq/sq
;; WARN: Return type mismatch int vs none.
(defmethod draw hud-gun ((this hud-gun))
(defmethod draw ((this hud-gun))
(local-vars (s3-0 int) (sv-16 int) (sv-32 dma-buffer))
(let ((s4-0 0)
(s5-0 0)
@@ -1108,7 +1108,7 @@
;; definition for method 16 of type hud-gun
;; WARN: Return type mismatch int vs none.
(defmethod update-values hud-gun ((this hud-gun))
(defmethod update-values ((this hud-gun))
(cond
((focus-test? *target* gun)
(set! (-> this values 0 target) (the-as int (-> *target* gun gun-type)))
@@ -1129,7 +1129,7 @@
;; definition for method 17 of type hud-gun
;; WARN: Return type mismatch int vs none.
(defmethod init-callback hud-gun ((this hud-gun))
(defmethod init-callback ((this hud-gun))
(set! (-> this gui-id)
(add-process *gui-control* this (gui-channel hud-upper-right) (gui-action hidden) (-> this name) 81920.0 0)
)
@@ -1148,7 +1148,7 @@
;; definition for method 15 of type hud-samos-young
;; WARN: Return type mismatch int vs none.
(defmethod draw hud-samos-young ((this hud-samos-young))
(defmethod draw ((this hud-samos-young))
(set-hud-piece-position!
(-> this sprites 2)
(the int (+ 30.0 (* -130.0 (-> this offset))))
@@ -1165,7 +1165,7 @@
;; definition for method 16 of type hud-samos-young
;; WARN: Return type mismatch int vs none.
(defmethod update-values hud-samos-young ((this hud-samos-young))
(defmethod update-values ((this hud-samos-young))
(set! (-> this values 0 target) (the int (* 100.0 (-> *game-info* bot-health 0))))
((method-of-type hud update-values) this)
0
@@ -1174,7 +1174,7 @@
;; definition for method 17 of type hud-samos-young
;; WARN: Return type mismatch int vs none.
(defmethod init-callback hud-samos-young ((this hud-samos-young))
(defmethod init-callback ((this hud-samos-young))
(set! (-> this gui-id)
(add-process *gui-control* this (gui-channel hud-upper-left) (gui-action hidden) (-> this name) 81920.0 0)
)
test/decompiler/reference/jak2/engine/ui/hud-h_REF.gc
Generated Vendored
+109 -320
View File
@@ -3,20 +3,17 @@
;; definition of type hud-string
(deftype hud-string (basic)
((text string :offset-assert 4)
(scale float :offset-assert 8)
(color font-color :offset-assert 12)
(flags font-flags :offset-assert 16)
(pos int32 4 :offset 32)
((text string)
(scale float)
(color font-color)
(flags font-flags)
(pos int32 4 :offset 32)
)
:allow-misaligned
:method-count-assert 9
:size-assert #x30
:flag-assert #x900000030
)
;; definition for method 3 of type hud-string
(defmethod inspect hud-string ((this hud-string))
(defmethod inspect ((this hud-string))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -33,26 +30,23 @@
;; definition of type hud-sprite
(deftype hud-sprite (structure)
((pos vector4w :inline :offset-assert 0)
(color vector4w :inline :offset-assert 16)
(color2 int32 4 :offset 16)
(flags uint32 :offset-assert 32)
(scale-x float :offset-assert 36)
(scale-y float :offset-assert 40)
(angle float :offset-assert 44)
(tex texture :offset-assert 48)
((pos vector4w :inline)
(color vector4w :inline)
(color2 int32 4 :overlay-at (-> color data 0))
(flags uint32)
(scale-x float)
(scale-y float)
(angle float)
(tex texture)
)
:method-count-assert 11
:size-assert #x34
:flag-assert #xb00000034
(:methods
(draw (_type_ dma-buffer level) none 9)
(hud-sprite-method-10 (_type_ dma-buffer level int int int int) object 10)
(draw (_type_ dma-buffer level) none)
(hud-sprite-method-10 (_type_ dma-buffer level int int int int) object)
)
)
;; definition for method 3 of type hud-sprite
(defmethod inspect hud-sprite ((this hud-sprite))
(defmethod inspect ((this hud-sprite))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -71,26 +65,23 @@
;; definition of type hud-box
(deftype hud-box (structure)
((min vector2 :inline :offset-assert 0)
(max vector2 :inline :offset-assert 8)
(color vector4w :inline :offset-assert 16)
((min vector2 :inline)
(max vector2 :inline)
(color vector4w :inline)
)
:method-count-assert 16
:size-assert #x20
:flag-assert #x1000000020
(:methods
(draw-box-prim-only (_type_ dma-buffer) none 9)
(draw-box-alpha-1 (_type_ dma-buffer) none 10)
(draw-box-alpha-2 (_type_ dma-buffer) none 11)
(draw-box-alpha-3 (_type_ dma-buffer) none 12)
(draw-scan-and-line (_type_ dma-buffer float) int 13)
(setup-scissor (_type_ dma-buffer) none 14)
(restore-scissor (_type_ dma-buffer) none 15)
(draw-box-prim-only (_type_ dma-buffer) none)
(draw-box-alpha-1 (_type_ dma-buffer) none)
(draw-box-alpha-2 (_type_ dma-buffer) none)
(draw-box-alpha-3 (_type_ dma-buffer) none)
(draw-scan-and-line (_type_ dma-buffer float) int)
(setup-scissor (_type_ dma-buffer) none)
(restore-scissor (_type_ dma-buffer) none)
)
)
;; definition for method 3 of type hud-box
(defmethod inspect hud-box ((this hud-box))
(defmethod inspect ((this hud-box))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -105,19 +96,16 @@
;; definition of type hud-icon
(deftype hud-icon (basic)
((icon (pointer manipy) :offset-assert 4)
(pos int32 4 :offset 16)
(scale-x float :offset-assert 32)
(scale-y float :offset-assert 36)
((icon (pointer manipy))
(pos int32 4 :offset 16)
(scale-x float)
(scale-y float)
)
:allow-misaligned
:method-count-assert 9
:size-assert #x28
:flag-assert #x900000028
)
;; definition for method 3 of type hud-icon
(defmethod inspect hud-icon ((this hud-icon))
(defmethod inspect ((this hud-icon))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -133,19 +121,16 @@
;; definition of type hud-value
(deftype hud-value (basic)
((current int32 :offset-assert 4)
(target int32 :offset-assert 8)
(flags uint16 :offset-assert 12)
(counter uint16 :offset-assert 14)
((current int32)
(target int32)
(flags uint16)
(counter uint16)
)
:allow-misaligned
:method-count-assert 9
:size-assert #x10
:flag-assert #x900000010
)
;; definition for method 3 of type hud-value
(defmethod inspect hud-value ((this hud-value))
(defmethod inspect ((this hud-value))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -161,34 +146,30 @@
;; definition of type hud
(deftype hud (process)
((trigger-time time-frame :offset-assert 128)
(last-hide-time time-frame :offset-assert 136)
(offset float :offset-assert 144)
(flags hud-flags :offset-assert 148)
(values hud-value 8 :inline :offset 148)
(strings hud-string 14 :inline :offset 284)
(sprites hud-sprite 30 :inline :offset 960)
(icons hud-icon 2 :inline :offset 2876)
(gui-id sound-id :offset 2976)
((trigger-time time-frame)
(last-hide-time time-frame)
(offset float)
(flags hud-flags)
(values hud-value 8 :inline :overlay-at flags)
(strings hud-string 14 :inline :offset 284)
(sprites hud-sprite 30 :inline :offset 960)
(icons hud-icon 2 :inline :offset 2876)
(gui-id sound-id :offset 2976)
)
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
(:methods
(hidden? (_type_) symbol 14)
(draw (_type_) none 15)
(update-values (_type_) none 16)
(init-callback (_type_) none 17)
(event-callback (_type_ process int symbol event-message-block) symbol 18)
(hud-method-19 (_type_) none 19)
(hud-method-20 (_type_) none 20)
(hud-method-21 (_type_) none 21)
(hud-method-22 (_type_) none 22)
(hud-method-23 (_type_) none 23)
(check-ready-and-maybe-show (_type_ symbol) symbol 24)
(update-value-callback (_type_ int int) none 25)
(alloc-string-if-needed (_type_ int) none 26)
(hidden? (_type_) symbol)
(draw (_type_) none)
(update-values (_type_) none)
(init-callback (_type_) none)
(event-callback (_type_ process int symbol event-message-block) symbol)
(hud-method-19 (_type_) none)
(hud-method-20 (_type_) none)
(hud-method-21 (_type_) none)
(hud-method-22 (_type_) none)
(hud-method-23 (_type_) none)
(check-ready-and-maybe-show (_type_ symbol) symbol)
(update-value-callback (_type_ int int) none)
(alloc-string-if-needed (_type_ int) none)
)
(:states
hud-arriving
@@ -199,7 +180,7 @@
)
;; definition for method 3 of type hud
(defmethod inspect hud ((this hud))
(defmethod inspect ((this hud))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -223,14 +204,10 @@
;; definition of type hud-ashelin
(deftype hud-ashelin (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-ashelin
(defmethod inspect hud-ashelin ((this hud-ashelin))
(defmethod inspect ((this hud-ashelin))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -245,14 +222,10 @@
;; definition of type hud-cargo
(deftype hud-cargo (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-cargo
(defmethod inspect hud-cargo ((this hud-cargo))
(defmethod inspect ((this hud-cargo))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -267,14 +240,10 @@
;; definition of type hud-citizen
(deftype hud-citizen (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-citizen
(defmethod inspect hud-citizen ((this hud-citizen))
(defmethod inspect ((this hud-citizen))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -289,14 +258,10 @@
;; definition of type hud-cpanel
(deftype hud-cpanel (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-cpanel
(defmethod inspect hud-cpanel ((this hud-cpanel))
(defmethod inspect ((this hud-cpanel))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -311,14 +276,10 @@
;; definition of type hud-dig-clasp
(deftype hud-dig-clasp (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-dig-clasp
(defmethod inspect hud-dig-clasp ((this hud-dig-clasp))
(defmethod inspect ((this hud-dig-clasp))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -333,14 +294,10 @@
;; definition of type hud-gun
(deftype hud-gun (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-gun
(defmethod inspect hud-gun ((this hud-gun))
(defmethod inspect ((this hud-gun))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -355,14 +312,10 @@
;; definition of type hud-health
(deftype hud-health (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-health
(defmethod inspect hud-health ((this hud-health))
(defmethod inspect ((this hud-health))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -377,14 +330,10 @@
;; definition of type hud-dark-eco-symbol
(deftype hud-dark-eco-symbol (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-dark-eco-symbol
(defmethod inspect hud-dark-eco-symbol ((this hud-dark-eco-symbol))
(defmethod inspect ((this hud-dark-eco-symbol))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -399,14 +348,10 @@
;; definition of type hud-helldog
(deftype hud-helldog (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-helldog
(defmethod inspect hud-helldog ((this hud-helldog))
(defmethod inspect ((this hud-helldog))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -421,14 +366,10 @@
;; definition of type hud-lurker
(deftype hud-lurker (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-lurker
(defmethod inspect hud-lurker ((this hud-lurker))
(defmethod inspect ((this hud-lurker))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -443,14 +384,10 @@
;; definition of type hud-map
(deftype hud-map (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-map
(defmethod inspect hud-map ((this hud-map))
(defmethod inspect ((this hud-map))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -465,14 +402,10 @@
;; definition of type hud-moneybag
(deftype hud-moneybag (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-moneybag
(defmethod inspect hud-moneybag ((this hud-moneybag))
(defmethod inspect ((this hud-moneybag))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -487,14 +420,10 @@
;; definition of type hud-pegasus
(deftype hud-pegasus (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-pegasus
(defmethod inspect hud-pegasus ((this hud-pegasus))
(defmethod inspect ((this hud-pegasus))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -509,14 +438,10 @@
;; definition of type hud-plasmite
(deftype hud-plasmite (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-plasmite
(defmethod inspect hud-plasmite ((this hud-plasmite))
(defmethod inspect ((this hud-plasmite))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -531,14 +456,10 @@
;; definition of type hud-dig-button
(deftype hud-dig-button (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-dig-button
(defmethod inspect hud-dig-button ((this hud-dig-button))
(defmethod inspect ((this hud-dig-button))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -553,14 +474,10 @@
;; definition of type hud-predator
(deftype hud-predator (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-predator
(defmethod inspect hud-predator ((this hud-predator))
(defmethod inspect ((this hud-predator))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -575,14 +492,10 @@
;; definition of type hud-heatmeter
(deftype hud-heatmeter (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-heatmeter
(defmethod inspect hud-heatmeter ((this hud-heatmeter))
(defmethod inspect ((this hud-heatmeter))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -597,14 +510,10 @@
;; definition of type hud-progress
(deftype hud-progress (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-progress
(defmethod inspect hud-progress ((this hud-progress))
(defmethod inspect ((this hud-progress))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -619,14 +528,10 @@
;; definition of type hud-rocketsensor
(deftype hud-rocketsensor (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-rocketsensor
(defmethod inspect hud-rocketsensor ((this hud-rocketsensor))
(defmethod inspect ((this hud-rocketsensor))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -641,14 +546,10 @@
;; definition of type hud-ruffians
(deftype hud-ruffians (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-ruffians
(defmethod inspect hud-ruffians ((this hud-ruffians))
(defmethod inspect ((this hud-ruffians))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -663,14 +564,10 @@
;; definition of type hud-score
(deftype hud-score (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-score
(defmethod inspect hud-score ((this hud-score))
(defmethod inspect ((this hud-score))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -685,14 +582,10 @@
;; definition of type hud-sig
(deftype hud-sig (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-sig
(defmethod inspect hud-sig ((this hud-sig))
(defmethod inspect ((this hud-sig))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -707,14 +600,10 @@
;; definition of type hud-skill
(deftype hud-skill (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-skill
(defmethod inspect hud-skill ((this hud-skill))
(defmethod inspect ((this hud-skill))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -729,14 +618,10 @@
;; definition of type hud-skullgem
(deftype hud-skullgem (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-skullgem
(defmethod inspect hud-skullgem ((this hud-skullgem))
(defmethod inspect ((this hud-skullgem))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -751,14 +636,10 @@
;; definition of type hud-timer
(deftype hud-timer (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-timer
(defmethod inspect hud-timer ((this hud-timer))
(defmethod inspect ((this hud-timer))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -773,14 +654,10 @@
;; definition of type hud-turret
(deftype hud-turret (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-turret
(defmethod inspect hud-turret ((this hud-turret))
(defmethod inspect ((this hud-turret))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -795,14 +672,10 @@
;; definition of type hud-squid
(deftype hud-squid (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-squid
(defmethod inspect hud-squid ((this hud-squid))
(defmethod inspect ((this hud-squid))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -817,14 +690,10 @@
;; definition of type hud-gunturret
(deftype hud-gunturret (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-gunturret
(defmethod inspect hud-gunturret ((this hud-gunturret))
(defmethod inspect ((this hud-gunturret))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -839,14 +708,10 @@
;; definition of type hud-gruntegg
(deftype hud-gruntegg (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-gruntegg
(defmethod inspect hud-gruntegg ((this hud-gruntegg))
(defmethod inspect ((this hud-gruntegg))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -861,14 +726,10 @@
;; definition of type hud-crimsonhover
(deftype hud-crimsonhover (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-crimsonhover
(defmethod inspect hud-crimsonhover ((this hud-crimsonhover))
(defmethod inspect ((this hud-crimsonhover))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -883,14 +744,10 @@
;; definition of type hud-metalkor
(deftype hud-metalkor (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-metalkor
(defmethod inspect hud-metalkor ((this hud-metalkor))
(defmethod inspect ((this hud-metalkor))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -905,14 +762,10 @@
;; definition of type hud-big-score
(deftype hud-big-score (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-big-score
(defmethod inspect hud-big-score ((this hud-big-score))
(defmethod inspect ((this hud-big-score))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -927,14 +780,10 @@
;; definition of type hud-goal
(deftype hud-goal (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-goal
(defmethod inspect hud-goal ((this hud-goal))
(defmethod inspect ((this hud-goal))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -949,14 +798,10 @@
;; definition of type hud-miss
(deftype hud-miss (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-miss
(defmethod inspect hud-miss ((this hud-miss))
(defmethod inspect ((this hud-miss))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -971,14 +816,10 @@
;; definition of type hud-race-timer
(deftype hud-race-timer (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-race-timer
(defmethod inspect hud-race-timer ((this hud-race-timer))
(defmethod inspect ((this hud-race-timer))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -993,14 +834,10 @@
;; definition of type hud-race-lap-counter
(deftype hud-race-lap-counter (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-race-lap-counter
(defmethod inspect hud-race-lap-counter ((this hud-race-lap-counter))
(defmethod inspect ((this hud-race-lap-counter))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -1015,14 +852,10 @@
;; definition of type hud-race-turbo-counter
(deftype hud-race-turbo-counter (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-race-turbo-counter
(defmethod inspect hud-race-turbo-counter ((this hud-race-turbo-counter))
(defmethod inspect ((this hud-race-turbo-counter))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -1037,14 +870,10 @@
;; definition of type hud-race-position
(deftype hud-race-position (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-race-position
(defmethod inspect hud-race-position ((this hud-race-position))
(defmethod inspect ((this hud-race-position))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -1059,14 +888,10 @@
;; definition of type hud-race-map
(deftype hud-race-map (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-race-map
(defmethod inspect hud-race-map ((this hud-race-map))
(defmethod inspect ((this hud-race-map))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -1081,14 +906,10 @@
;; definition of type hud-samos-old
(deftype hud-samos-old (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-samos-old
(defmethod inspect hud-samos-old ((this hud-samos-old))
(defmethod inspect ((this hud-samos-old))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -1103,14 +924,10 @@
;; definition of type hud-samos-young
(deftype hud-samos-young (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-samos-young
(defmethod inspect hud-samos-young ((this hud-samos-young))
(defmethod inspect ((this hud-samos-young))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -1125,14 +942,10 @@
;; definition of type hud-lurker-button
(deftype hud-lurker-button (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-lurker-button
(defmethod inspect hud-lurker-button ((this hud-lurker-button))
(defmethod inspect ((this hud-lurker-button))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -1147,14 +960,10 @@
;; definition of type hud-widow
(deftype hud-widow (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-widow
(defmethod inspect hud-widow ((this hud-widow))
(defmethod inspect ((this hud-widow))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -1169,14 +978,10 @@
;; definition of type hud-race-final-stats
(deftype hud-race-final-stats (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-race-final-stats
(defmethod inspect hud-race-final-stats ((this hud-race-final-stats))
(defmethod inspect ((this hud-race-final-stats))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -1191,14 +996,10 @@
;; definition of type hud-mech-air-tank
(deftype hud-mech-air-tank (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-mech-air-tank
(defmethod inspect hud-mech-air-tank ((this hud-mech-air-tank))
(defmethod inspect ((this hud-mech-air-tank))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -1213,14 +1014,10 @@
;; definition of type hud-homing-beacon
(deftype hud-homing-beacon (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-homing-beacon
(defmethod inspect hud-homing-beacon ((this hud-homing-beacon))
(defmethod inspect ((this hud-homing-beacon))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -1235,14 +1032,10 @@
;; definition of type hud-dark-eco-pickup
(deftype hud-dark-eco-pickup (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-dark-eco-pickup
(defmethod inspect hud-dark-eco-pickup ((this hud-dark-eco-pickup))
(defmethod inspect ((this hud-dark-eco-pickup))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -1257,14 +1050,10 @@
;; definition of type hud-green-eco-pickup
(deftype hud-green-eco-pickup (hud)
()
:heap-base #xb30
:method-count-assert 27
:size-assert #xba4
:flag-assert #x1b0b300ba4
)
;; definition for method 3 of type hud-green-eco-pickup
(defmethod inspect hud-green-eco-pickup ((this hud-green-eco-pickup))
(defmethod inspect ((this hud-green-eco-pickup))
(when (not this)
(set! this this)
(goto cfg-4)
test/decompiler/reference/jak2/engine/ui/minimap-h_REF.gc
Generated Vendored
+85 -103
View File
@@ -3,22 +3,19 @@
;; definition of type minimap-class-node
(deftype minimap-class-node (structure)
((default-position vector :inline :offset-assert 0)
(flags minimap-flag :offset-assert 16)
(class minimap-class :offset-assert 18)
(name basic :offset-assert 20)
(icon-xy vector2ub :inline :offset-assert 24)
(scale float :offset-assert 28)
(color rgba :offset-assert 32)
((default-position vector :inline)
(flags minimap-flag)
(class minimap-class)
(name basic)
(icon-xy vector2ub :inline)
(scale float)
(color rgba)
)
:pack-me
:method-count-assert 9
:size-assert #x24
:flag-assert #x900000024
)
;; definition for method 3 of type minimap-class-node
(defmethod inspect minimap-class-node ((this minimap-class-node))
(defmethod inspect ((this minimap-class-node))
(when (not this)
(set! this this)
(goto cfg-179)
@@ -313,24 +310,21 @@
;; definition of type connection-minimap
(deftype connection-minimap (connection-pers)
((handle handle :offset 8)
(position object :offset 16)
(alpha float :offset 20)
(class minimap-class-node :offset 24)
(flags minimap-flag :offset 28)
(node uint16 :offset 30)
(edge-ry float :offset-assert 32)
(last-world-pos vector :inline :offset-assert 48)
(last-relative-pos vector :inline :offset-assert 64)
((handle handle :overlay-at update-time)
(position object :overlay-at param-quat)
(alpha float :overlay-at (-> param-float 1))
(class minimap-class-node :overlay-at (-> param-float 2))
(flags minimap-flag :overlay-at (-> param 3))
(node uint16 :offset 30)
(edge-ry float)
(last-world-pos vector :inline)
(last-relative-pos vector :inline)
)
:method-count-assert 9
:size-assert #x50
:flag-assert #x900000050
)
;; definition for method 3 of type connection-minimap
;; INFO: Used lq/sq
(defmethod inspect connection-minimap ((this connection-minimap))
(defmethod inspect ((this connection-minimap))
(when (not this)
(set! this this)
(goto cfg-48)
@@ -422,16 +416,13 @@
;; definition of type engine-minimap
(deftype engine-minimap (engine-pers)
((alive-list connection-minimap :override)
(dead-list connection-minimap :override)
((alive-list connection-minimap :override)
(dead-list connection-minimap :override)
)
:method-count-assert 15
:size-assert #x20
:flag-assert #xf00000020
)
;; definition for method 3 of type engine-minimap
(defmethod inspect engine-minimap ((this engine-minimap))
(defmethod inspect ((this engine-minimap))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -451,26 +442,23 @@
;; definition of type minimap-trail
(deftype minimap-trail (structure)
((used-by connection-minimap :offset-assert 0)
(search-id uint32 :offset-assert 4)
(node-count int16 :offset-assert 8)
(goal-node-id int32 :offset-assert 12)
(node-path-dist float :offset-assert 16)
(last-updated uint64 :offset-assert 24)
(cached-info trail-cached-search-info :inline :offset-assert 32)
(node-id uint16 64 :offset-assert 80)
((used-by connection-minimap)
(search-id uint32)
(node-count int16)
(goal-node-id int32)
(node-path-dist float)
(last-updated uint64)
(cached-info trail-cached-search-info :inline)
(node-id uint16 64)
)
:method-count-assert 11
:size-assert #xd0
:flag-assert #xb000000d0
(:methods
(get-distance-with-path (_type_ vector vector) float 9)
(reset (_type_) none 10)
(get-distance-with-path (_type_ vector vector) float)
(reset (_type_) none)
)
)
;; definition for method 3 of type minimap-trail
(defmethod inspect minimap-trail ((this minimap-trail))
(defmethod inspect ((this minimap-trail))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -490,19 +478,16 @@
;; definition of type minimap-draw-work
(deftype minimap-draw-work (structure)
((buf dma-buffer :offset-assert 0)
(justify-right symbol :offset-assert 4)
(draw-pos vector4w :inline :offset-assert 16)
(mat matrix :inline :offset-assert 32)
(corner vector 4 :inline :offset-assert 96)
((buf dma-buffer)
(justify-right symbol)
(draw-pos vector4w :inline)
(mat matrix :inline)
(corner vector 4 :inline)
)
:method-count-assert 9
:size-assert #xa0
:flag-assert #x9000000a0
)
;; definition for method 3 of type minimap-draw-work
(defmethod inspect minimap-draw-work ((this minimap-draw-work))
(defmethod inspect ((this minimap-draw-work))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -519,62 +504,59 @@
;; definition of type minimap
(deftype minimap (structure)
((draw-tmpl dma-gif-packet :inline :offset-assert 0)
(draw2-tmpl dma-gif-packet :inline :offset-assert 32)
(draw3-tmpl dma-gif-packet :inline :offset-assert 64)
(draw4-tmpl dma-gif-packet :inline :offset-assert 96)
(sprite-tmpl dma-gif-packet :inline :offset-assert 128)
(adgif-tmpl dma-gif-packet :inline :offset-assert 160)
(color vector4w :inline :offset-assert 192)
(offset vector :inline :offset-assert 208)
(minimap-corner vector :inline :offset-assert 224)
(last-name string :offset-assert 240)
(last-tex basic :offset-assert 244)
(target-inv-scale float :offset-assert 248)
(map-bits uint64 :offset-assert 256)
(level level :offset-assert 264)
(ctywide level :offset-assert 268)
(inv-scale float :offset 212)
(fade float :offset 220)
(engine engine-minimap :offset-assert 272)
(engine-key uint32 :offset-assert 276)
(trail minimap-trail 6 :inline :offset-assert 288)
(race-tex texture :offset-assert 1536)
(race-scale float :offset-assert 1540)
(race-level level :offset-assert 1544)
(sprite2-tmpl dma-gif-packet :inline :offset-assert 1552)
(race-corner vector :inline :offset-assert 1584)
(goal-time float :offset-assert 1600)
(frustum-alpha float :offset-assert 1604)
((draw-tmpl dma-gif-packet :inline)
(draw2-tmpl dma-gif-packet :inline)
(draw3-tmpl dma-gif-packet :inline)
(draw4-tmpl dma-gif-packet :inline)
(sprite-tmpl dma-gif-packet :inline)
(adgif-tmpl dma-gif-packet :inline)
(color vector4w :inline)
(offset vector :inline)
(minimap-corner vector :inline)
(last-name string)
(last-tex basic)
(target-inv-scale float)
(map-bits uint64)
(level level)
(ctywide level)
(inv-scale float :overlay-at (-> offset data 1))
(fade float :overlay-at (-> offset data 3))
(engine engine-minimap)
(engine-key uint32)
(trail minimap-trail 6 :inline)
(race-tex texture)
(race-scale float)
(race-level level)
(sprite2-tmpl dma-gif-packet :inline)
(race-corner vector :inline)
(goal-time float)
(frustum-alpha float)
)
:method-count-assert 28
:size-assert #x648
:flag-assert #x1c00000648
(:methods
(debug-draw (_type_) none 9)
(get-trail-for-connection (_type_ connection-minimap symbol) minimap-trail 10)
(get-icon-draw-pos (_type_ connection-minimap minimap-trail vector float vector) symbol 11)
(add-icon! (_type_ process uint int vector int) connection-minimap 12)
(free-trail-by-connection (_type_ connection-minimap) none 13)
(update-trails (_type_) none 14)
(draw-1 (_type_ dma-buffer vector4w symbol) none 15)
(draw-connection (_type_ minimap-draw-work connection-minimap) none 16)
(draw-frustum-1 (_type_ minimap-draw-work connection-minimap) none 17)
(draw-frustum-2 (_type_ minimap-draw-work connection-minimap) none 18)
(sub-draw-1-2 (_type_ minimap-draw-work) none 19)
(update! (_type_) symbol 20)
(sub-draw-1-1 (_type_ minimap-draw-work) none 21)
(set-color (_type_ vector) none 22)
(draw-racer-2 (_type_ minimap-draw-work connection-minimap) none 23)
(draw-sprite2 (_type_ dma-buffer vector4w symbol) none 24)
(set-race-texture (_type_ texture float level) none 25)
(draw-racer-1 (_type_ minimap-draw-work connection-minimap float float float) none 26)
(set-race-corner (_type_ float float) none 27)
(debug-draw (_type_) none)
(get-trail-for-connection (_type_ connection-minimap symbol) minimap-trail)
(get-icon-draw-pos (_type_ connection-minimap minimap-trail vector float vector) symbol)
(add-icon! (_type_ process uint int vector int) connection-minimap)
(free-trail-by-connection (_type_ connection-minimap) none)
(update-trails (_type_) none)
(draw-1 (_type_ dma-buffer vector4w symbol) none)
(draw-connection (_type_ minimap-draw-work connection-minimap) none)
(draw-frustum-1 (_type_ minimap-draw-work connection-minimap) none)
(draw-frustum-2 (_type_ minimap-draw-work connection-minimap) none)
(sub-draw-1-2 (_type_ minimap-draw-work) none)
(update! (_type_) symbol)
(sub-draw-1-1 (_type_ minimap-draw-work) none)
(set-color (_type_ vector) none)
(draw-racer-2 (_type_ minimap-draw-work connection-minimap) none)
(draw-sprite2 (_type_ dma-buffer vector4w symbol) none)
(set-race-texture (_type_ texture float level) none)
(draw-racer-1 (_type_ minimap-draw-work connection-minimap float float float) none)
(set-race-corner (_type_ float float) none)
)
)
;; definition for method 3 of type minimap
(defmethod inspect minimap ((this minimap))
(defmethod inspect ((this minimap))
(when (not this)
(set! this this)
(goto cfg-4)
test/decompiler/reference/jak2/engine/ui/minimap_REF.gc
Generated Vendored
+29 -35
View File
@@ -3,15 +3,12 @@
;; definition of type minimap-texture-name-array
(deftype minimap-texture-name-array (structure)
((data string 35 :offset-assert 0)
((data string 35)
)
:method-count-assert 9
:size-assert #x8c
:flag-assert #x90000008c
)
;; definition for method 3 of type minimap-texture-name-array
(defmethod inspect minimap-texture-name-array ((this minimap-texture-name-array))
(defmethod inspect ((this minimap-texture-name-array))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -24,15 +21,12 @@
;; definition of type minimap-corner-array
(deftype minimap-corner-array (structure)
((data vector 35 :inline :offset-assert 0)
((data vector 35 :inline)
)
:method-count-assert 9
:size-assert #x230
:flag-assert #x900000230
)
;; definition for method 3 of type minimap-corner-array
(defmethod inspect minimap-corner-array ((this minimap-corner-array))
(defmethod inspect ((this minimap-corner-array))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -862,7 +856,7 @@
;; definition for method 9 of type minimap
;; WARN: Return type mismatch int vs none.
(defmethod debug-draw minimap ((this minimap))
(defmethod debug-draw ((this minimap))
(when *trail-graph*
(dotimes (s5-0 6)
(let ((s4-0 (-> this trail s5-0)))
@@ -912,7 +906,7 @@
;; definition for method 14 of type minimap
;; WARN: Return type mismatch int vs none.
;; ERROR: Unsupported inline assembly instruction kind - [mfc0 v1, Count]
(defmethod update-trails minimap ((this minimap))
(defmethod update-trails ((this minimap))
"Main function to do trail search per-frame"
(let ((s5-0 *trail-graph*))
(when s5-0
@@ -1023,7 +1017,7 @@
)
;; definition for method 10 of type minimap
(defmethod get-trail-for-connection minimap ((this minimap) (arg0 connection-minimap) (arg1 symbol))
(defmethod get-trail-for-connection ((this minimap) (arg0 connection-minimap) (arg1 symbol))
"Get a trail for connection. If arg1 is set, allow allocating a new one."
(local-vars (gp-0 minimap-trail))
(countdown (v1-0 6)
@@ -1056,7 +1050,7 @@
;; definition for method 13 of type minimap
;; WARN: Return type mismatch int vs none.
;; WARN: Function (method 13 minimap) has a return type of none, but the expression builder found a return statement.
(defmethod free-trail-by-connection minimap ((this minimap) (arg0 connection-minimap))
(defmethod free-trail-by-connection ((this minimap) (arg0 connection-minimap))
"Free the trail associated with this connection."
(countdown (v1-0 6)
(let ((a2-3 (-> this trail v1-0)))
@@ -1073,7 +1067,7 @@
;; definition for method 10 of type minimap-trail
;; WARN: Return type mismatch int vs none.
(defmethod reset minimap-trail ((this minimap-trail))
(defmethod reset ((this minimap-trail))
(set! (-> this node-count) -1)
(set! (-> this search-id) (the-as uint 0))
(set! (-> this last-updated) (the-as uint 0))
@@ -1083,7 +1077,7 @@
;; definition for method 11 of type minimap
;; INFO: Used lq/sq
(defmethod get-icon-draw-pos minimap ((this minimap) (arg0 connection-minimap) (arg1 minimap-trail) (arg2 vector) (arg3 float) (arg4 vector))
(defmethod get-icon-draw-pos ((this minimap) (arg0 connection-minimap) (arg1 minimap-trail) (arg2 vector) (arg3 float) (arg4 vector))
"Follow the path from the start until it reaches the border of the map, then get this position."
(let ((s5-0 (new 'stack-no-clear 'inline-array 'vector 4)))
(vector-reset! (-> s5-0 2))
@@ -1126,7 +1120,7 @@
)
;; definition for method 9 of type minimap-trail
(defmethod get-distance-with-path minimap-trail ((this minimap-trail) (arg0 vector) (arg1 vector))
(defmethod get-distance-with-path ((this minimap-trail) (arg0 vector) (arg1 vector))
"Assuming we go from a to b, using this path in the middle, how long is it?"
0.0
(let ((s4-0 *trail-graph*))
@@ -1150,7 +1144,7 @@
)
;; definition for method 2 of type connection-minimap
(defmethod print connection-minimap ((this connection-minimap))
(defmethod print ((this connection-minimap))
(format
#t
"#<connection-minimap ~16S #x~4X ~A @ #x~X>"
@@ -1163,7 +1157,7 @@
)
;; definition for method 3 of type engine-minimap
(defmethod inspect engine-minimap ((this engine-minimap))
(defmethod inspect ((this engine-minimap))
(call-parent-method this)
(let ((s5-0 0)
(s4-0 (the-as connection-pers (-> *minimap* engine alive-list)))
@@ -1181,7 +1175,7 @@
;; definition for method 14 of type engine-minimap
;; WARN: Return type mismatch int vs none.
(defmethod run-pending-updates! engine-minimap ((this engine-minimap) (arg0 time-frame))
(defmethod run-pending-updates! ((this engine-minimap) (arg0 time-frame))
(let ((s2-0 (the-as (pointer connection-pers) (&-> this alive-list)))
(s3-0 (-> this alive-list))
)
@@ -1253,7 +1247,7 @@
;; definition for method 12 of type minimap
;; INFO: Used lq/sq
(defmethod add-icon! minimap ((this minimap) (arg0 process) (arg1 uint) (arg2 int) (arg3 vector) (arg4 int))
(defmethod add-icon! ((this minimap) (arg0 process) (arg1 uint) (arg2 int) (arg3 vector) (arg4 int))
"Add an icon to the map!"
(when (not arg2)
(let ((v1-3 (+ (-> *minimap* engine-key) 1)))
@@ -1292,7 +1286,7 @@
;; definition for method 10 of type engine-minimap
;; WARN: Function (method 10 engine-minimap) has a return type of none, but the expression builder found a return statement.
(defmethod kill-callback engine-minimap ((this engine-minimap) (arg0 connection-pers))
(defmethod kill-callback ((this engine-minimap) (arg0 connection-pers))
(if (not arg0)
(return #f)
)
@@ -1333,7 +1327,7 @@
;; definition for method 20 of type minimap
;; INFO: Used lq/sq
(defmethod update! minimap ((this minimap))
(defmethod update! ((this minimap))
(set! (-> this ctywide) (level-get *level* 'ctywide))
(set! (-> this map-bits) (the-as uint 0))
(dotimes (v1-2 (-> *level* length))
@@ -1415,7 +1409,7 @@
;; definition for method 23 of type minimap
;; INFO: Used lq/sq
;; WARN: Return type mismatch pointer vs none.
(defmethod draw-racer-2 minimap ((this minimap) (arg0 minimap-draw-work) (arg1 connection-minimap))
(defmethod draw-racer-2 ((this minimap) (arg0 minimap-draw-work) (arg1 connection-minimap))
(local-vars
(sv-16 process)
(sv-20 dma-buffer)
@@ -1542,7 +1536,7 @@
;; WARN: Stack slot offset 20 signed mismatch
;; WARN: Stack slot offset 20 signed mismatch
;; WARN: Return type mismatch pointer vs none.
(defmethod draw-racer-1 minimap ((this minimap) (arg0 minimap-draw-work) (arg1 connection-minimap) (arg2 float) (arg3 float) (arg4 float))
(defmethod draw-racer-1 ((this minimap) (arg0 minimap-draw-work) (arg1 connection-minimap) (arg2 float) (arg3 float) (arg4 float))
(local-vars
(sv-16 process)
(sv-20 float)
@@ -1667,7 +1661,7 @@
;; definition for method 17 of type minimap
;; INFO: Used lq/sq
;; WARN: Return type mismatch pointer vs none.
(defmethod draw-frustum-1 minimap ((this minimap) (arg0 minimap-draw-work) (arg1 connection-minimap))
(defmethod draw-frustum-1 ((this minimap) (arg0 minimap-draw-work) (arg1 connection-minimap))
(local-vars
(sv-16 process)
(sv-20 dma-buffer)
@@ -1824,7 +1818,7 @@
;; definition for method 18 of type minimap
;; INFO: Used lq/sq
;; WARN: Return type mismatch pointer vs none.
(defmethod draw-frustum-2 minimap ((this minimap) (arg0 minimap-draw-work) (arg1 connection-minimap))
(defmethod draw-frustum-2 ((this minimap) (arg0 minimap-draw-work) (arg1 connection-minimap))
(local-vars
(sv-16 process)
(sv-20 dma-buffer)
@@ -1955,7 +1949,7 @@
;; definition for method 21 of type minimap
;; INFO: Used lq/sq
;; WARN: Return type mismatch int vs none.
(defmethod sub-draw-1-1 minimap ((this minimap) (arg0 minimap-draw-work))
(defmethod sub-draw-1-1 ((this minimap) (arg0 minimap-draw-work))
(let ((s5-0 (-> arg0 buf)))
(set-display-gs-state s5-0 (the-as int (-> *map-texture-base* vram-page)) 128 128 0 0)
(let ((s3-0 (-> s5-0 base)))
@@ -2120,7 +2114,7 @@
;; definition for method 19 of type minimap
;; INFO: Used lq/sq
;; WARN: Return type mismatch int vs none.
(defmethod sub-draw-1-2 minimap ((this minimap) (arg0 minimap-draw-work))
(defmethod sub-draw-1-2 ((this minimap) (arg0 minimap-draw-work))
(local-vars (a3-4 int) (t0-4 int) (sv-48 vector) (sv-52 matrix) (sv-56 vector))
(let ((s5-0 (-> arg0 buf)))
(reset-display-gs-state *display* s5-0)
@@ -2310,7 +2304,7 @@
;; definition for method 16 of type minimap
;; INFO: Used lq/sq
;; WARN: Return type mismatch pointer vs none.
(defmethod draw-connection minimap ((this minimap) (arg0 minimap-draw-work) (arg1 connection-minimap))
(defmethod draw-connection ((this minimap) (arg0 minimap-draw-work) (arg1 connection-minimap))
(let ((s1-0 (target-pos 0)))
(cond
((= (-> arg1 position) #t)
@@ -2565,7 +2559,7 @@
;; definition for method 15 of type minimap
;; INFO: Used lq/sq
;; WARN: Return type mismatch int vs none.
(defmethod draw-1 minimap ((this minimap) (arg0 dma-buffer) (arg1 vector4w) (arg2 symbol))
(defmethod draw-1 ((this minimap) (arg0 dma-buffer) (arg1 vector4w) (arg2 symbol))
(local-vars (v1-19 uint128))
(when (= (level-status *level* 'ctywide) 'active)
(let ((s5-1 (new 'stack-no-clear 'minimap-draw-work)))
@@ -2617,7 +2611,7 @@
;; definition for method 24 of type minimap
;; INFO: Used lq/sq
;; WARN: Return type mismatch int vs none.
(defmethod draw-sprite2 minimap ((this minimap) (arg0 dma-buffer) (arg1 vector4w) (arg2 symbol))
(defmethod draw-sprite2 ((this minimap) (arg0 dma-buffer) (arg1 vector4w) (arg2 symbol))
(local-vars (v1-24 uint128) (a0-8 uint128) (a3-5 int) (t0-4 int))
(when (-> this race-tex)
(let ((s5-0 (new 'stack-no-clear 'minimap-draw-work)))
@@ -2731,7 +2725,7 @@
;; definition for method 25 of type minimap
;; WARN: Return type mismatch int vs none.
(defmethod set-race-texture minimap ((this minimap) (arg0 texture) (arg1 float) (arg2 level))
(defmethod set-race-texture ((this minimap) (arg0 texture) (arg1 float) (arg2 level))
(set! (-> this race-tex) arg0)
(set! (-> this race-scale) arg1)
(set! (-> this race-level) arg2)
@@ -2741,7 +2735,7 @@
;; definition for method 27 of type minimap
;; WARN: Return type mismatch int vs none.
(defmethod set-race-corner minimap ((this minimap) (arg0 float) (arg1 float))
(defmethod set-race-corner ((this minimap) (arg0 float) (arg1 float))
(set! (-> this race-corner x) arg0)
(set! (-> this race-corner z) arg1)
0
@@ -2751,7 +2745,7 @@
;; definition for method 22 of type minimap
;; INFO: Used lq/sq
;; WARN: Return type mismatch int vs none.
(defmethod set-color minimap ((this minimap) (arg0 vector))
(defmethod set-color ((this minimap) (arg0 vector))
(set! (-> this color quad) (-> arg0 quad))
0
(none)
test/decompiler/reference/jak2/engine/ui/progress/progress-draw_REF.gc
Generated Vendored
+69 -72
View File
@@ -633,7 +633,7 @@
;; definition for method 10 of type menu-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-option ((this menu-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
0
(none)
)
@@ -641,7 +641,7 @@
;; definition for method 10 of type menu-on-off-option
;; INFO: Used lq/sq
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-on-off-option ((this menu-on-off-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-on-off-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars (a0-8 string) (sv-16 string))
(let ((s3-0 (if arg3
(&-> *progress-state* on-off-choice)
@@ -707,7 +707,7 @@
;; definition for method 10 of type menu-yes-no-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-yes-no-option ((this menu-yes-no-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-yes-no-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars (a0-8 string))
(let ((s3-0 (&-> *progress-state* yes-no-choice)))
(set! a0-8
@@ -755,7 +755,7 @@
;; definition for method 10 of type menu-video-mode-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-video-mode-option ((this menu-video-mode-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-video-mode-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(let ((s3-0 (&-> *progress-state* video-mode-choice))
(f28-0 (* 2.0 (- 0.5 (-> arg0 menu-transition))))
(f30-0 (-> arg1 origin y))
@@ -867,7 +867,7 @@
;; definition for method 10 of type menu-unlocked-menu-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-unlocked-menu-option ((this menu-unlocked-menu-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-unlocked-menu-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(let ((s5-0 (memcard-unlocked-secrets? #t))
(f30-0 (* 2.0 (- 0.5 (-> arg0 menu-transition))))
)
@@ -1050,7 +1050,7 @@
;; definition for method 10 of type menu-main-menu-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-main-menu-option ((this menu-main-menu-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-main-menu-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(-> arg1 flags)
(when (and (= (-> arg0 menu-transition) 0.0) (and (= (-> arg0 ring-angle) (-> arg0 ring-want-angle))
(nonzero? (-> this name))
@@ -2121,7 +2121,7 @@
;; WARN: Stack slot offset 36 signed mismatch
;; WARN: Stack slot offset 16 signed mismatch
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-memcard-slot-option ((this menu-memcard-slot-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-memcard-slot-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars
(v0-74 pointer)
(sv-16 float)
@@ -2559,7 +2559,7 @@
;; definition for method 10 of type menu-loading-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-loading-option ((this menu-loading-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-loading-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(let ((f30-0 (* 2.0 (- 0.5 (-> arg0 menu-transition)))))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((v1-3 arg1))
@@ -2616,7 +2616,7 @@
;; definition for method 10 of type menu-insufficient-space-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-insufficient-space-option ((this menu-insufficient-space-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-insufficient-space-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(when (!= (-> arg0 current) 'none)
(let ((v1-3 arg1))
@@ -2709,7 +2709,7 @@
;; definition for method 10 of type menu-secrets-insufficient-space-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-secrets-insufficient-space-option ((this menu-secrets-insufficient-space-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-secrets-insufficient-space-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((v1-1 arg1))
(set! (-> v1-1 scale) 0.5)
@@ -2756,7 +2756,7 @@
;; definition for method 10 of type menu-insert-card-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-insert-card-option ((this menu-insert-card-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-insert-card-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((v1-1 arg1))
(set! (-> v1-1 scale) 0.5)
@@ -2804,7 +2804,7 @@
;; definition for method 10 of type menu-error-loading-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-error-loading-option ((this menu-error-loading-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-error-loading-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((v1-1 arg1))
(set! (-> v1-1 scale) 0.5)
@@ -2873,7 +2873,7 @@
;; definition for method 10 of type menu-error-auto-saving-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-error-auto-saving-option ((this menu-error-auto-saving-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-error-auto-saving-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((v1-1 arg1))
(set! (-> v1-1 scale) 0.5)
@@ -2950,7 +2950,7 @@
;; definition for method 10 of type menu-card-removed-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-card-removed-option ((this menu-card-removed-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-card-removed-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((v1-1 arg1))
(set! (-> v1-1 scale) 0.5)
@@ -3013,7 +3013,7 @@
;; definition for method 10 of type menu-error-disc-removed-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-error-disc-removed-option ((this menu-error-disc-removed-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-error-disc-removed-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((a0-1 arg1))
(set! (-> a0-1 color) (font-color progress))
@@ -3073,7 +3073,7 @@
;; definition for method 10 of type menu-error-reading-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-error-reading-option ((this menu-error-reading-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-error-reading-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((a0-1 arg1))
(set! (-> a0-1 color) (font-color progress))
@@ -3131,7 +3131,7 @@
;; definition for method 10 of type menu-icon-info-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-icon-info-option ((this menu-icon-info-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-icon-info-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((a0-1 arg1))
(set! (-> a0-1 color) (font-color progress))
@@ -3207,7 +3207,7 @@
;; definition for method 10 of type menu-format-card-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-format-card-option ((this menu-format-card-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-format-card-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((a0-1 arg1))
(set! (-> a0-1 color) (font-color progress))
@@ -3261,7 +3261,7 @@
;; definition for method 10 of type menu-already-exists-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-already-exists-option ((this menu-already-exists-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-already-exists-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((a0-1 arg1))
(set! (-> a0-1 color) (font-color progress))
@@ -3307,7 +3307,7 @@
;; definition for method 10 of type menu-create-game-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-create-game-option ((this menu-create-game-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-create-game-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((a0-1 arg1))
(set! (-> a0-1 color) (font-color progress))
@@ -3350,7 +3350,7 @@
;; definition for method 10 of type menu-video-mode-warning-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-video-mode-warning-option ((this menu-video-mode-warning-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-video-mode-warning-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((a0-1 arg1))
(set! (-> a0-1 color) (font-color progress))
@@ -3418,7 +3418,7 @@
;; definition for method 10 of type menu-video-mode-ok-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-video-mode-ok-option ((this menu-video-mode-ok-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-video-mode-ok-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((a0-1 arg1))
(set! (-> a0-1 color) (font-color progress))
@@ -3464,7 +3464,7 @@
;; definition for method 10 of type menu-progressive-mode-warning-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-progressive-mode-warning-option ((this menu-progressive-mode-warning-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-progressive-mode-warning-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((a0-1 arg1))
(set! (-> a0-1 color) (font-color progress))
@@ -3532,7 +3532,7 @@
;; definition for method 10 of type menu-progressive-mode-ok-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-progressive-mode-ok-option ((this menu-progressive-mode-ok-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-progressive-mode-ok-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((a0-1 arg1))
(set! (-> a0-1 color) (font-color progress))
@@ -3578,7 +3578,7 @@
;; definition for method 10 of type menu-quit-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-quit-option ((this menu-quit-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-quit-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((a0-1 arg1))
(set! (-> a0-1 color) (font-color progress))
@@ -3615,7 +3615,7 @@
;; INFO: Used lq/sq
;; WARN: Return type mismatch int vs none.
;; WARN: disable def twice: 147. This may happen when a cond (no else) is nested inside of another conditional, but it should be rare.
(defmethod draw-option menu-select-start-option ((this menu-select-start-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-select-start-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars
(sv-48 int)
(sv-64 int)
@@ -3786,7 +3786,7 @@
;; definition for method 10 of type menu-select-scene-option
;; INFO: Used lq/sq
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-select-scene-option ((this menu-select-scene-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-select-scene-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars
(sv-48 int)
(sv-64 (function string font-context symbol int bucket-id float))
@@ -3964,7 +3964,7 @@
;; definition for method 10 of type menu-bigmap-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-bigmap-option ((this menu-bigmap-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-bigmap-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
0
(none)
)
@@ -4184,7 +4184,7 @@
;; WARN: Stack slot offset 20 signed mismatch
;; WARN: Stack slot offset 20 signed mismatch
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-missions-option ((this menu-missions-option) (progress progress) (font-ctx font-context) (arg3 int) (arg4 symbol))
(defmethod draw-option ((this menu-missions-option) (progress progress) (font-ctx font-context) (arg3 int) (arg4 symbol))
(local-vars
(f0-50 float)
(font-alpha float)
@@ -4888,7 +4888,7 @@
;; WARN: Stack slot offset 112 signed mismatch
;; WARN: Stack slot offset 108 signed mismatch
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-secret-option ((this menu-secret-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-secret-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars
(sv-16 float)
(sv-20 symbol)
@@ -5100,23 +5100,20 @@
;; definition of type print-highscore-obj
(deftype print-highscore-obj (basic)
((self menu-highscores-option :offset-assert 4)
(index int32 :offset-assert 8)
(previous symbol :offset-assert 12)
(place int32 :offset-assert 16)
(score float :offset-assert 20)
(game-score symbol :offset-assert 24)
(context font-context :offset-assert 28)
(local-scale float :offset-assert 32)
(interp float :offset-assert 36)
((self menu-highscores-option)
(index int32)
(previous symbol)
(place int32)
(score float)
(game-score symbol)
(context font-context)
(local-scale float)
(interp float)
)
:method-count-assert 9
:size-assert #x28
:flag-assert #x900000028
)
;; definition for method 3 of type print-highscore-obj
(defmethod inspect print-highscore-obj ((this print-highscore-obj))
(defmethod inspect ((this print-highscore-obj))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -6072,12 +6069,12 @@
;; WARN: Stack slot offset 120 signed mismatch
;; WARN: Stack slot offset 108 signed mismatch
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-highscores-option ((this menu-highscores-option)
(progress progress)
(font-ctx font-context)
(option-index int)
(selected? symbol)
)
(defmethod draw-option ((this menu-highscores-option)
(progress progress)
(font-ctx font-context)
(option-index int)
(selected? symbol)
)
(local-vars
(sv-96 float)
(sv-100 float)
@@ -6382,7 +6379,7 @@
;; definition for method 10 of type menu-on-off-game-vibrations-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-on-off-game-vibrations-option ((this menu-on-off-game-vibrations-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-on-off-game-vibrations-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars (a0-10 string))
(let ((f30-0 (* 2.0 (- 0.5 (-> arg0 menu-transition)))))
(if (< f30-0 0.0)
@@ -6472,7 +6469,7 @@
;; definition for method 10 of type menu-on-off-game-subtitles-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-on-off-game-subtitles-option ((this menu-on-off-game-subtitles-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-on-off-game-subtitles-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars (a0-11 string))
(let ((f30-0 (* 2.0 (- 0.5 (-> arg0 menu-transition)))))
(if (< f30-0 0.0)
@@ -6562,7 +6559,7 @@
;; definition for method 10 of type menu-subtitle-language-game-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-subtitle-language-game-option ((this menu-subtitle-language-game-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-subtitle-language-game-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(with-pp
(let ((f30-0 (* 2.0 (- 0.5 (-> arg0 menu-transition)))))
(let ((v1-2 arg1))
@@ -6697,12 +6694,12 @@
;; definition for method 10 of type menu-language-game-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-language-game-option ((this menu-language-game-option)
(progress progress)
(font-ctx font-context)
(option-index int)
(selected symbol)
)
(defmethod draw-option ((this menu-language-game-option)
(progress progress)
(font-ctx font-context)
(option-index int)
(selected symbol)
)
(with-pp
(let ((alpha (* 2.0 (- 0.5 (-> progress menu-transition)))))
(let ((font-ctx-1 font-ctx))
@@ -6851,7 +6848,7 @@
;; definition for method 10 of type menu-sub-menu-game-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-sub-menu-game-option ((this menu-sub-menu-game-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-sub-menu-game-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(let ((f0-1 (* 2.0 (- 0.5 (-> arg0 menu-transition)))))
395.0
(-> arg1 origin y)
@@ -6874,7 +6871,7 @@
;; definition for method 10 of type menu-aspect-ratio-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-aspect-ratio-option ((this menu-aspect-ratio-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-aspect-ratio-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars (a0-12 string))
(let ((f30-0 (* 2.0 (- 0.5 (-> arg0 menu-transition)))))
(if (< f30-0 0.0)
@@ -6981,12 +6978,12 @@
;; definition for method 10 of type menu-on-off-progressive-scan-graphic-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-on-off-progressive-scan-graphic-option ((this menu-on-off-progressive-scan-graphic-option)
(arg0 progress)
(arg1 font-context)
(arg2 int)
(arg3 symbol)
)
(defmethod draw-option ((this menu-on-off-progressive-scan-graphic-option)
(arg0 progress)
(arg1 font-context)
(arg2 int)
(arg3 symbol)
)
(local-vars (a0-11 string))
(let ((f30-0 (* 2.0 (- 0.5 (-> arg0 menu-transition)))))
(if (< f30-0 0.0)
@@ -7089,7 +7086,7 @@
;; definition for method 10 of type menu-center-screen-graphic-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-center-screen-graphic-option ((this menu-center-screen-graphic-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-center-screen-graphic-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(let ((f30-0 (* 2.0 (- 0.5 (-> arg0 menu-transition)))))
(if (< f30-0 0.0)
(set! f30-0 0.0)
@@ -7196,7 +7193,7 @@
;; definition for method 10 of type menu-restart-mission-qr-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-restart-mission-qr-option ((this menu-restart-mission-qr-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-restart-mission-qr-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars (a0-11 string))
(let ((f0-1 (* 2.0 (- 0.5 (-> arg0 menu-transition)))))
(if (< f0-1 0.0)
@@ -7261,7 +7258,7 @@
;; definition for method 10 of type menu-quit-qr-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-quit-qr-option ((this menu-quit-qr-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-quit-qr-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars (a0-12 string))
(let ((f30-0 (* 2.0 (- 0.5 (-> arg0 menu-transition)))))
(if (< f30-0 0.0)
@@ -7338,7 +7335,7 @@
;; definition for method 10 of type menu-slider-option
;; INFO: Used lq/sq
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-slider-option ((this menu-slider-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-slider-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars
(v0-42 pointer)
(sv-16 progress)
@@ -7711,7 +7708,7 @@
;; definition for method 10 of type menu-stereo-mode-sound-option
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-stereo-mode-sound-option ((this menu-stereo-mode-sound-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-stereo-mode-sound-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars (s5-0 int))
(let ((f30-0 (* 2.0 (- 0.5 (-> arg0 menu-transition)))))
(let ((v1-2 arg1))
@@ -7819,7 +7816,7 @@
;; definition for method 10 of type menu-sub-menu-option
;; INFO: Used lq/sq
;; WARN: Return type mismatch int vs none.
(defmethod draw-option menu-sub-menu-option ((this menu-sub-menu-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option ((this menu-sub-menu-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars (sv-16 dma-buffer))
(let ((f30-0 (* 2.0 (- 0.5 (-> arg0 menu-transition))))
(s2-0 (the int (+ -1.0 (-> arg1 origin y))))
test/decompiler/reference/jak2/engine/ui/progress/progress-h_REF.gc
Generated Vendored
+167 -331
View File
File diff suppressed because it is too large Load Diff
test/decompiler/reference/jak2/engine/ui/progress/progress-static_REF.gc
Generated Vendored
+7 -10
View File
@@ -880,20 +880,17 @@
;; definition of type hud-scene-info
(deftype hud-scene-info (basic)
((name string :offset-assert 4)
(continue string :offset-assert 8)
(info object :offset-assert 12)
(info-str string :offset 12)
(info-list pair :offset 12)
(text text-id :offset-assert 16)
((name string)
(continue string)
(info object)
(info-str string :overlay-at info)
(info-list pair :overlay-at info)
(text text-id)
)
:method-count-assert 9
:size-assert #x14
:flag-assert #x900000014
)
;; definition for method 3 of type hud-scene-info
(defmethod inspect hud-scene-info ((this hud-scene-info))
(defmethod inspect ((this hud-scene-info))
(when (not this)
(set! this this)
(goto cfg-4)
test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc
Generated Vendored
+100 -107
View File
@@ -3,61 +3,58 @@
;; definition of type progress-global-state
(deftype progress-global-state (basic)
((aspect-ratio-choice symbol :offset-assert 4)
(video-mode-choice symbol :offset-assert 8)
(yes-no-choice symbol :offset-assert 12)
(on-off-choice symbol :offset-assert 16)
(which-slot int32 :offset-assert 20)
(starting-state symbol :offset-assert 24)
(last-slot-saved int32 :offset-assert 28)
(slider-backup float :offset-assert 32)
(language-backup language-enum :offset-assert 40)
(center-x-backup int32 :offset-assert 48)
(center-y-backup int32 :offset-assert 52)
(aspect-ratio-backup symbol :offset-assert 56)
(last-slider-sound time-frame :offset-assert 64)
(video-mode-timeout time-frame :offset-assert 72)
(progressive-mode-timeout time-frame :offset-assert 80)
(current-task-index int32 :offset-assert 88)
(current-line-index int32 :offset-assert 92)
(first-closed-line-index int32 :offset-assert 96)
(extra-text-state int32 :offset-assert 100)
(current-task uint8 :offset-assert 104)
(num-open-tasks-found int32 :offset-assert 108)
(num-closed-tasks-found int32 :offset-assert 112)
(color-flash-counter int32 :offset-assert 116)
(num-unlocked-secrets int32 :offset-assert 120)
(game-options-item-selected int32 :offset-assert 124)
(game-options-item-picked basic :offset-assert 128)
(game-options-last-move time-frame :offset-assert 136)
(game-options-vibrations symbol :offset-assert 144)
(game-options-subtitles symbol :offset-assert 148)
(game-options-language-index int32 :offset-assert 152)
(game-options-subtitle-language-index int32 :offset-assert 156)
(graphic-options-item-selected int32 :offset-assert 160)
(graphic-options-item-picked symbol :offset-assert 164)
(graphic-options-last-move time-frame :offset-assert 168)
(graphic-options-aspect-ratio symbol :offset-assert 176)
(graphic-options-progressive-scan symbol :offset-assert 180)
(qr-options-item-selected int32 :offset-assert 184)
(qr-options-item-picked basic :offset-assert 188)
(qr-options-last-move time-frame :offset-assert 192)
(qr-options-restart basic :offset-assert 200)
(qr-options-quit basic :offset-assert 204)
(total-num-tasks int32 :offset-assert 208)
(scene-player-act int32 :offset-assert 212)
(stereo-mode-backup int32 :offset-assert 216)
(secrets-unlocked symbol :offset-assert 220)
(missions-total-spacing float :offset-assert 224)
(clear-screen symbol :offset-assert 228)
((aspect-ratio-choice symbol)
(video-mode-choice symbol)
(yes-no-choice symbol)
(on-off-choice symbol)
(which-slot int32)
(starting-state symbol)
(last-slot-saved int32)
(slider-backup float)
(language-backup language-enum)
(center-x-backup int32)
(center-y-backup int32)
(aspect-ratio-backup symbol)
(last-slider-sound time-frame)
(video-mode-timeout time-frame)
(progressive-mode-timeout time-frame)
(current-task-index int32)
(current-line-index int32)
(first-closed-line-index int32)
(extra-text-state int32)
(current-task uint8)
(num-open-tasks-found int32)
(num-closed-tasks-found int32)
(color-flash-counter int32)
(num-unlocked-secrets int32)
(game-options-item-selected int32)
(game-options-item-picked basic)
(game-options-last-move time-frame)
(game-options-vibrations symbol)
(game-options-subtitles symbol)
(game-options-language-index int32)
(game-options-subtitle-language-index int32)
(graphic-options-item-selected int32)
(graphic-options-item-picked symbol)
(graphic-options-last-move time-frame)
(graphic-options-aspect-ratio symbol)
(graphic-options-progressive-scan symbol)
(qr-options-item-selected int32)
(qr-options-item-picked basic)
(qr-options-last-move time-frame)
(qr-options-restart basic)
(qr-options-quit basic)
(total-num-tasks int32)
(scene-player-act int32)
(stereo-mode-backup int32)
(secrets-unlocked symbol)
(missions-total-spacing float)
(clear-screen symbol)
)
:method-count-assert 9
:size-assert #xe8
:flag-assert #x9000000e8
)
;; definition for method 3 of type progress-global-state
(defmethod inspect progress-global-state ((this progress-global-state))
(defmethod inspect ((this progress-global-state))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -158,7 +155,7 @@
;; definition for method 24 of type progress
;; WARN: Return type mismatch connection vs object.
(defmethod init-defaults progress ((this progress))
(defmethod init-defaults ((this progress))
"Initialize default menu settings."
(set! (-> *progress-state* aspect-ratio-choice) (get-aspect-ratio))
(set! (-> *progress-state* video-mode-choice) (get-video-mode))
@@ -229,22 +226,18 @@
;; definition of type hud-ring-cell
(deftype hud-ring-cell (process-drawable)
((parent (pointer progress) :override)
(joint-idx int32 :offset-assert 200)
(init-angle degrees :offset-assert 204)
(graphic-index int32 :offset-assert 208)
((parent (pointer progress) :override)
(joint-idx int32)
(init-angle degrees)
(graphic-index int32)
)
:heap-base #x60
:method-count-assert 21
:size-assert #xd4
:flag-assert #x15006000d4
(:methods
(idle () _type_ :state 20)
(:state-methods
idle
)
)
;; definition for method 3 of type hud-ring-cell
(defmethod inspect hud-ring-cell ((this hud-ring-cell))
(defmethod inspect ((this hud-ring-cell))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -542,7 +535,7 @@
)
;; definition for method 10 of type progress
(defmethod deactivate progress ((this progress))
(defmethod deactivate ((this progress))
(remove-setting-by-arg0 *setting-control* 'extra-bank)
(disable-drawing *bigmap*)
(set! (-> *blit-displays-work* menu-mode) #f)
@@ -575,7 +568,7 @@
)
;; definition for method 26 of type progress
(defmethod gone? progress ((this progress))
(defmethod gone? ((this progress))
(and *progress-process*
(-> *progress-process* 0 next-state)
(= (-> *progress-process* 0 next-state name) 'gone)
@@ -609,7 +602,7 @@
)
;; definition for method 27 of type progress
(defmethod can-go-back? progress ((this progress))
(defmethod can-go-back? ((this progress))
(and (= (-> this menu-transition) 0.0)
(not (-> this selected-option))
(!= (-> this current) 'loading)
@@ -669,7 +662,7 @@
)
;; definition for method 28 of type progress
(defmethod get-state-check-card progress ((this progress) (arg0 symbol))
(defmethod get-state-check-card ((this progress) (arg0 symbol))
(let ((v1-0 *progress-save-info*)
(v0-0 arg0)
)
@@ -767,7 +760,7 @@
)
;; definition for method 29 of type progress
(defmethod push-state progress ((this progress))
(defmethod push-state ((this progress))
(let ((v1-0 (-> this state-pos)))
(cond
((< v1-0 5)
@@ -784,7 +777,7 @@
)
;; definition for method 30 of type progress
(defmethod pop-state progress ((this progress))
(defmethod pop-state ((this progress))
(let ((v1-0 (-> this state-pos)))
(cond
((> v1-0 0)
@@ -808,7 +801,7 @@
)
;; definition for method 31 of type progress
(defmethod set-next-state progress ((this progress) (arg0 symbol) (arg1 int))
(defmethod set-next-state ((this progress) (arg0 symbol) (arg1 int))
"Set the next menu state specified by arg0 at the index specified by arg1."
(set! (-> *progress-state* clear-screen) #f)
(when (!= arg0 (-> this current))
@@ -855,7 +848,7 @@
)
;; definition for method 32 of type progress
(defmethod set-menu-options progress ((this progress) (arg0 symbol))
(defmethod set-menu-options ((this progress) (arg0 symbol))
"Set the menu options for the menu state specified by arg0."
(set! (-> this current-options) #f)
(case arg0
@@ -1064,7 +1057,7 @@
;; definition for method 25 of type progress
;; WARN: Return type mismatch int vs none.
(defmethod respond-to-cpad progress ((this progress))
(defmethod respond-to-cpad ((this progress))
(mc-get-slot-info 0 *progress-save-info*)
(when (-> this current-options)
(let ((option-array (-> this current-options options)))
@@ -1823,13 +1816,13 @@
)
;; definition for method 9 of type menu-option
(defmethod respond-progress menu-option ((this menu-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
0
)
;; definition for method 9 of type menu-on-off-option
(defmethod respond-progress menu-on-off-option ((this menu-on-off-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-on-off-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(let ((v1-1 (&-> *progress-state* on-off-choice))
(gp-0 #f)
@@ -1880,7 +1873,7 @@
)
;; definition for method 9 of type menu-yes-no-option
(defmethod respond-progress menu-yes-no-option ((this menu-yes-no-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-yes-no-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(let ((v1-1 (&-> *progress-state* yes-no-choice))
(gp-0 #f)
@@ -1922,7 +1915,7 @@
)
;; definition for method 9 of type menu-slider-option
(defmethod respond-progress menu-slider-option ((this menu-slider-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-slider-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(when (-> *bigmap* progress-minimap)
(let ((gp-0 (-> this value-to-modify))
@@ -2005,7 +1998,7 @@
)
;; definition for method 9 of type menu-stereo-mode-sound-option
(defmethod respond-progress menu-stereo-mode-sound-option ((this menu-stereo-mode-sound-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-stereo-mode-sound-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(when (-> *bigmap* progress-minimap)
(let ((a0-1 (-> *setting-control* user-default stereo-mode))
@@ -2044,7 +2037,7 @@
)
;; definition for method 9 of type menu-main-menu-option
(defmethod respond-progress menu-main-menu-option ((this menu-main-menu-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-main-menu-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(cond
((cpad-pressed? 0 start)
@@ -2140,7 +2133,7 @@
)
;; definition for method 9 of type menu-sub-menu-option
(defmethod respond-progress menu-sub-menu-option ((this menu-sub-menu-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-sub-menu-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(when (and (-> *progress-state* secrets-unlocked)
(not (memcard-unlocked-secrets? #f))
@@ -2201,7 +2194,7 @@
)
;; definition for method 9 of type menu-unlocked-menu-option
(defmethod respond-progress menu-unlocked-menu-option ((this menu-unlocked-menu-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-unlocked-menu-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(let ((s4-0 (memcard-unlocked-secrets? #t)))
(logclear! (-> *game-info* purchase-secrets) (game-secrets hero-mode))
@@ -2339,7 +2332,7 @@
)
;; definition for method 9 of type menu-memcard-slot-option
(defmethod respond-progress menu-memcard-slot-option ((this menu-memcard-slot-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-memcard-slot-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(memcard-unlocked-secrets? #t)
(let ((a1-2 (get-state-check-card arg0 (-> arg0 current))))
@@ -2385,7 +2378,7 @@
)
;; definition for method 9 of type menu-already-exists-option
(defmethod respond-progress menu-already-exists-option ((this menu-already-exists-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-already-exists-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(let ((s4-0 (&-> *progress-state* yes-no-choice))
(a1-2 (get-state-check-card arg0 'select-save))
@@ -2428,7 +2421,7 @@
)
;; definition for method 9 of type menu-create-game-option
(defmethod respond-progress menu-create-game-option ((this menu-create-game-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-create-game-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(let ((s4-0 (&-> *progress-state* yes-no-choice))
(gp-0 #f)
@@ -2474,7 +2467,7 @@
)
;; definition for method 9 of type menu-insufficient-space-option
(defmethod respond-progress menu-insufficient-space-option ((this menu-insufficient-space-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-insufficient-space-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(let ((s5-0 (&-> *progress-state* yes-no-choice))
(s3-0 (get-state-check-card arg0 'select-save))
@@ -2570,7 +2563,7 @@
)
;; definition for method 9 of type menu-secrets-insufficient-space-option
(defmethod respond-progress menu-secrets-insufficient-space-option ((this menu-secrets-insufficient-space-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-secrets-insufficient-space-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(&-> *progress-state* yes-no-choice)
(cond
@@ -2589,7 +2582,7 @@
)
;; definition for method 9 of type menu-video-mode-warning-option
(defmethod respond-progress menu-video-mode-warning-option ((this menu-video-mode-warning-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-video-mode-warning-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(let ((v1-1 (&-> *progress-state* yes-no-choice))
(gp-0 #f)
@@ -2628,7 +2621,7 @@
)
;; definition for method 9 of type menu-video-mode-ok-option
(defmethod respond-progress menu-video-mode-ok-option ((this menu-video-mode-ok-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-video-mode-ok-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(let ((v1-1 (&-> *progress-state* yes-no-choice))
(s5-0 #f)
@@ -2675,7 +2668,7 @@
)
;; definition for method 9 of type menu-progressive-mode-warning-option
(defmethod respond-progress menu-progressive-mode-warning-option ((this menu-progressive-mode-warning-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-progressive-mode-warning-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(let ((v1-1 (&-> *progress-state* yes-no-choice))
(gp-0 #f)
@@ -2721,7 +2714,7 @@
)
;; definition for method 9 of type menu-progressive-mode-ok-option
(defmethod respond-progress menu-progressive-mode-ok-option ((this menu-progressive-mode-ok-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-progressive-mode-ok-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(let ((v1-1 (&-> *progress-state* yes-no-choice))
(s5-0 #f)
@@ -2770,7 +2763,7 @@
)
;; definition for method 9 of type menu-card-removed-option
(defmethod respond-progress menu-card-removed-option ((this menu-card-removed-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-card-removed-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(when (cpad-pressed? 0 confirm)
(logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
@@ -2782,7 +2775,7 @@
)
;; definition for method 9 of type menu-insert-card-option
(defmethod respond-progress menu-insert-card-option ((this menu-insert-card-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-insert-card-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
*progress-save-info*
(cond
@@ -2800,7 +2793,7 @@
)
;; definition for method 9 of type menu-error-loading-option
(defmethod respond-progress menu-error-loading-option ((this menu-error-loading-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-error-loading-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(when (cpad-pressed? 0 confirm)
(logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
@@ -2812,7 +2805,7 @@
)
;; definition for method 9 of type menu-error-auto-saving-option
(defmethod respond-progress menu-error-auto-saving-option ((this menu-error-auto-saving-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-error-auto-saving-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(when (cpad-pressed? 0 confirm)
(logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
@@ -2824,7 +2817,7 @@
)
;; definition for method 9 of type menu-error-disc-removed-option
(defmethod respond-progress menu-error-disc-removed-option ((this menu-error-disc-removed-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-error-disc-removed-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(when (cpad-pressed? 0 confirm)
(logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
@@ -2838,7 +2831,7 @@
)
;; definition for method 9 of type menu-error-reading-option
(defmethod respond-progress menu-error-reading-option ((this menu-error-reading-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-error-reading-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(when (cpad-pressed? 0 confirm)
(logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
@@ -2850,7 +2843,7 @@
)
;; definition for method 9 of type menu-icon-info-option
(defmethod respond-progress menu-icon-info-option ((this menu-icon-info-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-icon-info-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(when (cpad-pressed? 0 confirm)
(logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
@@ -2862,7 +2855,7 @@
)
;; definition for method 9 of type menu-quit-option
(defmethod respond-progress menu-quit-option ((this menu-quit-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-quit-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(let ((v1-1 (&-> *progress-state* yes-no-choice))
(gp-0 #f)
@@ -2907,7 +2900,7 @@
)
;; definition for method 9 of type menu-format-card-option
(defmethod respond-progress menu-format-card-option ((this menu-format-card-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-format-card-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(let ((s4-0 (&-> *progress-state* yes-no-choice))
(gp-0 #f)
@@ -2953,7 +2946,7 @@
;; definition for method 9 of type menu-select-start-option
;; WARN: disable def twice: 110. This may happen when a cond (no else) is nested inside of another conditional, but it should be rare.
(defmethod respond-progress menu-select-start-option ((this menu-select-start-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-select-start-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(set! (-> arg0 sliding-height) (seek-ease
(-> arg0 sliding-height)
@@ -3049,7 +3042,7 @@
)
;; definition for method 9 of type menu-select-scene-option
(defmethod respond-progress menu-select-scene-option ((this menu-select-scene-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-select-scene-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(set! (-> arg0 sliding-height) (seek-ease
(-> arg0 sliding-height)
@@ -3125,7 +3118,7 @@
)
;; definition for method 9 of type menu-bigmap-option
(defmethod respond-progress menu-bigmap-option ((this menu-bigmap-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-bigmap-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(handle-cpad-inputs *bigmap*)
(logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
@@ -3134,7 +3127,7 @@
)
;; definition for method 9 of type menu-missions-option
(defmethod respond-progress menu-missions-option ((this menu-missions-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-missions-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(set! (-> arg0 sliding-height) (seek-ease
(-> arg0 sliding-height)
@@ -3184,7 +3177,7 @@
)
;; definition for method 9 of type menu-highscores-option
(defmethod respond-progress menu-highscores-option ((this menu-highscores-option) (progress progress) (selected? symbol))
(defmethod respond-progress ((this menu-highscores-option) (progress progress) (selected? symbol))
"Handle progress menu navigation logic."
(set! (-> progress sliding) (seek-ease
(-> progress sliding)
@@ -3252,7 +3245,7 @@
)
;; definition for method 9 of type menu-secret-option
(defmethod respond-progress menu-secret-option ((this menu-secret-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-secret-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(let* ((s5-1 (logtest? (-> *game-info* secrets) (game-secrets hero-mode)))
(s3-0 (if (not s5-1)
@@ -3371,7 +3364,7 @@
)
;; definition for method 9 of type menu-game-option
(defmethod respond-progress menu-game-option ((this menu-game-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-game-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(-> *progress-state* game-options-vibrations)
(-> *progress-state* game-options-subtitles)
@@ -3592,7 +3585,7 @@
)
;; definition for method 9 of type menu-graphic-option
(defmethod respond-progress menu-graphic-option ((this menu-graphic-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-graphic-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(-> *progress-state* graphic-options-aspect-ratio)
(-> *progress-state* graphic-options-progressive-scan)
@@ -3806,7 +3799,7 @@
)
;; definition for method 9 of type menu-qr-option
(defmethod respond-progress menu-qr-option ((this menu-qr-option) (arg0 progress) (arg1 symbol))
(defmethod respond-progress ((this menu-qr-option) (arg0 progress) (arg1 symbol))
"Handle progress menu navigation logic."
(-> *progress-state* qr-options-restart)
(-> *progress-state* qr-options-quit)
test/decompiler/reference/jak2/engine/ui/text-h_REF.gc
Generated Vendored
+9 -15
View File
@@ -3,17 +3,14 @@
;; definition of type game-text
(deftype game-text (structure)
((id text-id :offset-assert 0)
(text string :offset-assert 4)
((id text-id)
(text string)
)
:pack-me
:method-count-assert 9
:size-assert #x8
:flag-assert #x900000008
)
;; definition for method 3 of type game-text
(defmethod inspect game-text ((this game-text))
(defmethod inspect ((this game-text))
(when (not this)
(set! this this)
(goto cfg-4)
@@ -27,21 +24,18 @@
;; definition of type game-text-info
(deftype game-text-info (basic)
((length int32 :offset-assert 4)
(language-id int32 :offset-assert 8)
(group-name string :offset-assert 12)
(data game-text :inline :dynamic :offset-assert 16)
((length int32)
(language-id int32)
(group-name string)
(data game-text :inline :dynamic)
)
:method-count-assert 10
:size-assert #x10
:flag-assert #xa00000010
(:methods
(lookup-text! (_type_ text-id symbol) string 9)
(lookup-text! (_type_ text-id symbol) string)
)
)
;; definition for method 3 of type game-text-info
(defmethod inspect game-text-info ((this game-text-info))
(defmethod inspect ((this game-text-info))
(when (not this)
(set! this this)
(goto cfg-4)
test/decompiler/reference/jak2/engine/ui/text_REF.gc
Generated Vendored
+7 -7
View File
@@ -36,7 +36,7 @@
(kmemclose)
;; definition for method 7 of type game-text-info
(defmethod relocate game-text-info ((this game-text-info) (arg0 int))
(defmethod relocate ((this game-text-info) (arg0 int))
(let ((v1-1 (-> *level* loading-level)))
(when v1-1
(set! (-> v1-1 loaded-text-info (-> v1-1 loaded-text-info-count)) this)
@@ -47,18 +47,18 @@
)
;; definition for method 4 of type game-text-info
(defmethod length game-text-info ((this game-text-info))
(defmethod length ((this game-text-info))
(-> this length)
)
;; definition for method 5 of type game-text-info
;; WARN: Return type mismatch uint vs int.
(defmethod asize-of game-text-info ((this game-text-info))
(defmethod asize-of ((this game-text-info))
(the-as int (+ (-> this type size) (* (-> this length) 8)))
)
;; definition for method 3 of type game-text-info
(defmethod inspect game-text-info ((this game-text-info))
(defmethod inspect ((this game-text-info))
(format #t "[~8x] ~A~%" this (-> this type))
(format #t "~Tlength: ~D~%" (-> this length))
(format #t "~Tlanguage-id: ~D~%" (-> this language-id))
@@ -71,7 +71,7 @@
)
;; definition for method 8 of type game-text-info
(defmethod mem-usage game-text-info ((this game-text-info) (arg0 memory-usage-block) (arg1 int))
(defmethod mem-usage ((this game-text-info) (arg0 memory-usage-block) (arg1 int))
(set! (-> arg0 length) (max 84 (-> arg0 length)))
(set! (-> arg0 data 83 name) "string")
(+! (-> arg0 data 83 count) 1)
@@ -181,7 +181,7 @@
)
;; definition for method 9 of type game-text-info
(defmethod lookup-text! game-text-info ((this game-text-info) (arg0 text-id) (arg1 symbol))
(defmethod lookup-text! ((this game-text-info) (arg0 text-id) (arg1 symbol))
(cond
((= this #f)
(cond
@@ -234,7 +234,7 @@
)
;; definition for method 23 of type level
(defmethod lookup-text level ((this level) (arg0 text-id) (arg1 symbol))
(defmethod lookup-text ((this level) (arg0 text-id) (arg1 symbol))
(let ((v1-0 *common-text*))
(dotimes (a3-0 (-> this loaded-text-info-count))
(if (= (-> this loaded-text-info a3-0 language-id) (-> *setting-control* user-current language))