mirror of
https://github.com/open-goal/jak-project
synced 2026-08-15 12:59:39 -04:00
deftype and defmethod syntax major changes (#3094)
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
@@ -627,12 +627,12 @@
|
||||
(the-as pointer 0)
|
||||
)
|
||||
|
||||
(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)
|
||||
)
|
||||
|
||||
(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)
|
||||
@@ -696,7 +696,7 @@
|
||||
(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
|
||||
@@ -742,7 +742,7 @@
|
||||
(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))
|
||||
@@ -852,7 +852,7 @@
|
||||
(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))))
|
||||
)
|
||||
@@ -1033,7 +1033,7 @@
|
||||
(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))
|
||||
@@ -1949,7 +1949,7 @@
|
||||
)
|
||||
)
|
||||
|
||||
(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)
|
||||
@@ -2385,7 +2385,7 @@
|
||||
(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))
|
||||
@@ -2440,7 +2440,7 @@
|
||||
(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))
|
||||
@@ -2531,7 +2531,7 @@
|
||||
(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)
|
||||
@@ -2576,7 +2576,7 @@
|
||||
(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)
|
||||
@@ -2622,7 +2622,7 @@
|
||||
(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)
|
||||
@@ -2689,7 +2689,7 @@
|
||||
(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)
|
||||
@@ -2764,7 +2764,7 @@
|
||||
(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)
|
||||
@@ -2825,7 +2825,7 @@
|
||||
(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))
|
||||
@@ -2883,7 +2883,7 @@
|
||||
(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))
|
||||
@@ -2939,7 +2939,7 @@
|
||||
(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))
|
||||
@@ -3013,7 +3013,7 @@
|
||||
(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)))
|
||||
(set-color! arg1 (font-color progress))
|
||||
(set-scale! arg1 0.5)
|
||||
@@ -3056,7 +3056,7 @@
|
||||
(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)))
|
||||
(set-color! arg1 (font-color progress))
|
||||
(set-scale! arg1 0.5)
|
||||
@@ -3093,7 +3093,7 @@
|
||||
(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)))
|
||||
(set-color! arg1 (font-color progress))
|
||||
(set-scale! arg1 0.5)
|
||||
@@ -3127,7 +3127,7 @@
|
||||
(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)))
|
||||
(set-color! arg1 (font-color progress))
|
||||
(set-scale! arg1 0.5)
|
||||
@@ -3182,7 +3182,7 @@
|
||||
(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)))
|
||||
(set-color! arg1 (font-color progress))
|
||||
(set-scale! arg1 0.5)
|
||||
@@ -3219,7 +3219,7 @@
|
||||
(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)))
|
||||
(set-color! arg1 (font-color progress))
|
||||
(set-scale! arg1 0.5)
|
||||
@@ -3274,7 +3274,7 @@
|
||||
(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)))
|
||||
(set-color! arg1 (font-color progress))
|
||||
(set-scale! arg1 0.55)
|
||||
@@ -3311,7 +3311,7 @@
|
||||
(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)))
|
||||
(set-color! arg1 (font-color progress))
|
||||
(set-scale! arg1 0.55)
|
||||
@@ -3341,7 +3341,7 @@
|
||||
|
||||
(defglobalconstant COMPACT_SELECT_START #f)
|
||||
;; 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)
|
||||
@@ -3483,7 +3483,7 @@
|
||||
(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))
|
||||
(let ((f30-0 (* 2.0 (- 0.5 (-> arg0 menu-transition))))
|
||||
(s4-0 (-> this task-index))
|
||||
@@ -3580,7 +3580,7 @@
|
||||
(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)
|
||||
)
|
||||
@@ -3721,7 +3721,7 @@
|
||||
)
|
||||
)
|
||||
|
||||
(defmethod draw-option menu-missions-option ((this menu-missions-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
|
||||
(defmethod draw-option ((this menu-missions-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
|
||||
(local-vars
|
||||
(f0-50 float)
|
||||
(sv-16 float)
|
||||
@@ -4116,7 +4116,7 @@
|
||||
(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)
|
||||
@@ -4341,15 +4341,15 @@
|
||||
)
|
||||
|
||||
(deftype print-highscore-obj (basic)
|
||||
((self menu-highscores-option :offset-assert 4)
|
||||
(index int32 :offset-assert 8)
|
||||
(previous symbol :offset-assert 12) ; guess
|
||||
(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) ; guess
|
||||
(place int32)
|
||||
(score float)
|
||||
(game-score symbol)
|
||||
(context font-context)
|
||||
(local-scale float)
|
||||
(interp float)
|
||||
)
|
||||
:method-count-assert 9
|
||||
:size-assert #x28
|
||||
@@ -5153,7 +5153,7 @@
|
||||
)
|
||||
)
|
||||
|
||||
(defmethod draw-option menu-highscores-option ((this menu-highscores-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
|
||||
(defmethod draw-option ((this menu-highscores-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
|
||||
(local-vars
|
||||
(sv-96 float)
|
||||
(sv-100 float)
|
||||
@@ -5456,7 +5456,7 @@
|
||||
(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)
|
||||
@@ -5544,7 +5544,7 @@
|
||||
(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)
|
||||
@@ -5632,7 +5632,7 @@
|
||||
(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))
|
||||
@@ -5765,12 +5765,12 @@
|
||||
)
|
||||
)
|
||||
|
||||
(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))
|
||||
@@ -5917,7 +5917,7 @@
|
||||
)
|
||||
)
|
||||
|
||||
(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)
|
||||
@@ -5938,7 +5938,7 @@
|
||||
(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)
|
||||
@@ -6043,12 +6043,12 @@
|
||||
(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)
|
||||
@@ -6149,7 +6149,7 @@
|
||||
(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)
|
||||
@@ -6254,7 +6254,7 @@
|
||||
(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)
|
||||
@@ -6317,7 +6317,7 @@
|
||||
(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)
|
||||
@@ -6391,7 +6391,7 @@
|
||||
(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)
|
||||
@@ -6767,7 +6767,7 @@
|
||||
(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))
|
||||
@@ -6876,7 +6876,7 @@
|
||||
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 361]
|
||||
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 417]
|
||||
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 435]
|
||||
(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))))
|
||||
|
||||
Reference in New Issue
Block a user