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

cleanup settings stuff (#1444)

Browse Source 
* rename `setting-control` methods

* macros around settings stuff

* fix some `process-spawn`s

* update source 1

* update remaining stuff + fix silly bug

* clang

* AGH
This commit is contained in:
ManDude
2022-06-12 17:23:08 +01:00
committed by GitHub
parent 7bf19759d3
commit df991470f7
110 changed files with 2678 additions and 2666 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/decompiler/reference/engine/ambient/ambient_REF.gc
Generated Vendored
+15 -15
View File
@@ -312,7 +312,7 @@
(set! (-> self total-off-time) 0)
(set! (-> self last-time) (-> *display* base-frame-counter))
(set! *hint-semaphore* (the-as (pointer level-hint) (process->ppointer self)))
(push-setting! *setting-control* self 'hint (process->ppointer self) 0.0 0)
(add-setting! 'hint (process->ppointer self) 0.0 0)
(set! (-> self voicebox) (the-as handle #f))
(let ((s5-1 (res-lump-struct arg2 'play-mode structure))
(a0-6 (the-as string ((method-of-type res-lump get-property-struct)
@@ -355,12 +355,12 @@
(set! (-> self last-time) (-> *display* base-frame-counter))
(set! (-> self trans) arg1)
(set! *hint-semaphore* (the-as (pointer level-hint) (process->ppointer self)))
(push-setting! *setting-control* self 'hint (process->ppointer self) 0.0 0)
(add-setting! 'hint (process->ppointer self) 0.0 0)
(set! (-> self mode) arg2)
(if (or (= arg2 'camera) (= arg2 'ambient) (= arg2 'stinger))
(push-setting! *setting-control* self 'ambient (process->ppointer self) 0.0 0)
(add-setting! 'ambient (process->ppointer self) 0.0 0)
)
(copy-settings-from-target! *setting-control*)
(apply-settings *setting-control*)
(set! (-> self event-hook) (lambda :behavior level-hint
((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block))
(let ((v1-0 arg2))
@@ -490,9 +490,9 @@
(if (nonzero? (-> self sound-id))
(sound-stop (-> self sound-id))
)
(clear-pending-settings-from-process *setting-control* self 'music-volume)
(clear-pending-settings-from-process *setting-control* self 'sfx-volume)
(clear-pending-settings-from-process *setting-control* self 'dialog-volume)
(remove-setting! 'music-volume)
(remove-setting! 'sfx-volume)
(remove-setting! 'dialog-volume)
(if (= (ppointer->process *hint-semaphore*) self)
(set! *hint-semaphore* (the-as (pointer level-hint) #f))
)
@@ -527,9 +527,9 @@
)
(cond
((= (current-str-id) s5-2)
(push-setting! *setting-control* self 'music-volume 'rel (-> *setting-control* current music-volume-movie) 0)
(push-setting! *setting-control* self 'sfx-volume 'rel (-> *setting-control* current sfx-volume-movie) 0)
(push-setting! *setting-control* self 'dialog-volume 'rel (-> *setting-control* current dialog-volume-hint) 0)
(add-setting! 'music-volume 'rel (-> *setting-control* current music-volume-movie) 0)
(add-setting! 'sfx-volume 'rel (-> *setting-control* current sfx-volume-movie) 0)
(add-setting! 'dialog-volume 'rel (-> *setting-control* current dialog-volume-hint) 0)
(while (= (current-str-id) s5-2)
(suspend)
)
@@ -553,8 +553,8 @@
(if (nonzero? (-> self sound-id))
(sound-stop (-> self sound-id))
)
(clear-pending-settings-from-process *setting-control* self 'music-volume)
(clear-pending-settings-from-process *setting-control* self 'sfx-volume)
(remove-setting! 'music-volume)
(remove-setting! 'sfx-volume)
(if (= (ppointer->process *hint-semaphore*) self)
(set! *hint-semaphore* (the-as (pointer level-hint) #f))
)
@@ -592,8 +592,8 @@
(cond
((= (current-str-id) (-> self sound-id))
(when (or (= (-> self mode) 'stinger) (= (-> self mode) 'camera))
(push-setting! *setting-control* self 'music-volume 'rel (-> *setting-control* current music-volume-movie) 0)
(push-setting! *setting-control* self 'sfx-volume 'rel (-> *setting-control* current sfx-volume-movie) 0)
(add-setting! 'music-volume 'rel (-> *setting-control* current music-volume-movie) 0)
(add-setting! 'sfx-volume 'rel (-> *setting-control* current sfx-volume-movie) 0)
)
(while (= (current-str-id) (-> self sound-id))
(suspend)
@@ -612,7 +612,7 @@
(defstate level-hint-error (level-hint)
:event (-> level-hint-normal event)
:code (behavior ((arg0 string) (arg1 string))
(clear-pending-settings-from-process *setting-control* self 'hint)
(remove-setting! 'hint)
(let ((s4-0 (-> *display* base-frame-counter)))
(until (>= (- (-> *display* base-frame-counter) s4-0) (seconds 1))
(when (and *debug-segment* (not (paused?)) (not (str-is-playing?)) (bottom-hud-hidden?))
test/decompiler/reference/engine/camera/pov-camera_REF.gc
Generated Vendored
+4 -4
View File
@@ -105,13 +105,13 @@
(if (= (-> self anim-name type) string)
(restore-load-state-and-cleanup *load-state*)
)
(clear-pending-settings-from-process *setting-control* self 'music-volume)
(clear-pending-settings-from-process *setting-control* self 'sfx-volume)
(remove-setting! 'music-volume)
(remove-setting! 'sfx-volume)
(none)
)
:code (behavior ()
(push-setting! *setting-control* self 'music-volume 'rel (-> self music-volume-movie) 0)
(push-setting! *setting-control* self 'sfx-volume 'rel (-> self sfx-volume-movie) 0)
(add-setting! 'music-volume 'rel (-> self music-volume-movie) 0)
(add-setting! 'sfx-volume 'rel (-> self sfx-volume-movie) 0)
(cond
((= (-> self anim-name type) string)
(ja-no-eval :group! (ja-group) :num! (seek!) :frame-num 0.0)
test/decompiler/reference/engine/debug/anim-tester_REF.gc
Generated Vendored
+1 -13
View File
@@ -2913,19 +2913,7 @@
;; definition for function anim-tester-start
(defun anim-tester-start ()
(anim-tester-stop)
(let ((gp-0 (get-process *16k-dead-pool* anim-tester #x4000)))
(set! *anim-tester*
(the-as (pointer anim-tester)
(when gp-0
(let ((t9-2 (method-of-type anim-tester activate)))
(t9-2 (the-as anim-tester gp-0) *default-pool* 'anim-tester (the-as pointer #x70004000))
)
((the-as (function process function none) run-function-in-process) gp-0 initialize-anim-tester)
(-> gp-0 ppointer)
)
)
)
)
(set! *anim-tester* (process-spawn anim-tester :init initialize-anim-tester :from *16k-dead-pool*))
(set! *camera-orbit-target* *anim-tester*)
(send-event *camera* 'change-state cam-orbit 0)
#f
test/decompiler/reference/engine/game/collectables_REF.gc
Generated Vendored
+8 -15
View File
@@ -1585,8 +1585,8 @@
)
)
)
(push-setting! *setting-control* self 'allow-progress #f 0.0 0)
(copy-settings-from-target! *setting-control*)
(add-setting! 'allow-progress #f 0.0 0)
(apply-settings *setting-control*)
(logclear! (-> self mask) (process-mask actor-pause))
(go-virtual pickup #f (process->handle arg0))
)
@@ -1800,16 +1800,9 @@
(set! (-> self draw bounds w) 32768.0)
(logior! (-> self skel status) (janim-status inited))
(send-event *target* 'blend-shape #t)
(push-setting! *setting-control* self 'music-volume 'rel (-> *setting-control* current music-volume-movie) 0)
(push-setting! *setting-control* self 'sfx-volume 'rel (-> *setting-control* current sfx-volume-movie) 0)
(push-setting!
*setting-control*
self
'ambient-volume
'rel
(-> *setting-control* current ambient-volume-movie)
0
)
(add-setting! 'music-volume 'rel (-> *setting-control* current music-volume-movie) 0)
(add-setting! 'sfx-volume 'rel (-> *setting-control* current sfx-volume-movie) 0)
(add-setting! 'ambient-volume 'rel (-> *setting-control* current ambient-volume-movie) 0)
(process-spawn othercam self 10 #f #t :to self)
(auto-save-command 'auto-save 0 0 *default-pool*)
(ja-play-spooled-anim
@@ -1818,9 +1811,9 @@
(the-as art-joint-anim #f)
(the-as (function process-drawable symbol) false-func)
)
(clear-pending-settings-from-process *setting-control* self 'music-volume)
(clear-pending-settings-from-process *setting-control* self 'sfx-volume)
(clear-pending-settings-from-process *setting-control* self 'ambient-volume)
(remove-setting! 'music-volume)
(remove-setting! 'sfx-volume)
(remove-setting! 'ambient-volume)
(send-event *target* 'blend-shape #f)
(send-event *target* 'end-mode)
(send-event *camera* 'no-intro)
test/decompiler/reference/engine/game/game-info_REF.gc
Generated Vendored
+3 -3
View File
@@ -240,9 +240,9 @@
)
((= v1-65 'play)
(when *target*
(set-setting! *setting-control* *target* 'allow-pause #f 0.0 0)
(set-setting! *setting-control* *target* 'allow-progress #f 0.0 0)
(copy-settings-from-target! *setting-control*)
(set-setting *setting-control* *target* 'allow-pause #f 0.0 0)
(set-setting *setting-control* *target* 'allow-progress #f 0.0 0)
(apply-settings *setting-control*)
)
(send-event (handle->process (-> *game-info* auto-save-proc)) 'die)
(set! (-> *level* border?) #f)
test/decompiler/reference/engine/game/game-save_REF.gc
Generated Vendored
+4 -4
View File
@@ -1709,13 +1709,13 @@ auto-save-post
(go-virtual error (mc-status-code bad-version))
)
)
(set-setting! *setting-control* self 'music-volume 'abs 0.0 0)
(set-setting! *setting-control* self 'sfx-volume 'abs 0.0 0)
(set-setting! 'music-volume 'abs 0.0 0)
(set-setting! 'sfx-volume 'abs 0.0 0)
(set! (-> *game-info* mode) 'play)
(initialize! *game-info* 'game (-> self save) (the-as string #f))
(set-master-mode 'game)
(push-setting! *setting-control* self 'process-mask 'set 0.0 16)
(copy-settings-from-target! *setting-control*)
(add-setting! 'process-mask 'set 0.0 (process-mask progress))
(apply-settings *setting-control*)
(dotimes (gp-1 15)
(suspend)
)
test/decompiler/reference/engine/game/generic-obs_REF.gc
Generated Vendored
+4 -4
View File
@@ -1181,10 +1181,10 @@
(dummy-30 (-> self entity-override) (entity-perm-status bit-3) #t)
)
(if (not (-> self border-value))
(push-setting! *setting-control* self 'border-mode (-> self border-value) 0.0 0)
(add-setting! 'border-mode (-> self border-value) 0.0 0)
)
(push-setting! *setting-control* self 'process-mask 'set 0.0 (-> self mask-to-clear))
(push-setting! *setting-control* self 'movie (process->ppointer self) 0.0 0)
(add-setting! 'process-mask 'set 0.0 (-> self mask-to-clear))
(add-setting! 'movie (process->ppointer self) 0.0 0)
(hide-hud-quick)
(none)
)
@@ -1207,7 +1207,7 @@
)
)
)
(clear-pending-settings-from-process *setting-control* self 'process-mask)
(remove-setting! 'process-mask)
(send-event *camera* 'clear-entity)
(suspend)
(suspend)
test/decompiler/reference/engine/game/main_REF.gc
Generated Vendored
+3 -3
View File
@@ -125,7 +125,7 @@
(hide-progress-screen)
)
)
(copy-settings-from-target! *setting-control*)
(apply-settings *setting-control*)
0
(none)
)
@@ -911,7 +911,7 @@
(set-blackout-frames (seconds 100))
(set! (-> *setting-control* default allow-pause) #f)
(set! (-> *setting-control* default allow-progress) #f)
(copy-settings-from-target! *setting-control*)
(apply-settings *setting-control*)
(set! (-> *setting-control* default sfx-volume) 0.0)
(set! (-> *setting-control* default music-volume) 0.0)
(set! (-> *setting-control* default dialog-volume) 0.0)
@@ -970,7 +970,7 @@
(let ((disp *display*))
(dma-send-to-spr (the-as uint #x70000000) (the-as uint *terrain-context*) (the-as uint 0) #t)
(set! *teleport* #t)
(update-per-frame-settings! *setting-control*)
(update *setting-control*)
(init-time-of-day-context *time-of-day-context*)
(display-sync disp)
(swap-display disp)
test/decompiler/reference/engine/game/settings-h_REF.gc
Generated Vendored
+5 -5
View File
@@ -106,11 +106,11 @@
:flag-assert #xe00000278
(:methods
(new (symbol type int) _type_ 0)
(push-setting! (_type_ process symbol object object object) none 9)
(set-setting! (_type_ process symbol symbol float int) none 10)
(clear-pending-settings-from-process (_type_ process symbol) none 11)
(copy-settings-from-target! (_type_) setting-data 12)
(update-per-frame-settings! (_type_) setting-data 13)
(add-setting (_type_ process symbol object object object) none 9)
(set-setting (_type_ process symbol object object object) none 10)
(remove-setting (_type_ process symbol) none 11)
(apply-settings (_type_) setting-data 12)
(update (_type_) setting-data 13)
)
)
test/decompiler/reference/engine/game/settings_REF.gc
Generated Vendored
+7 -7
View File
@@ -194,7 +194,7 @@
;; definition for method 9 of type setting-control
;; INFO: Return type mismatch int vs none.
(defmethod push-setting! setting-control ((obj setting-control) (arg0 process) (arg1 symbol) (arg2 object) (arg3 object) (arg4 object))
(defmethod add-setting setting-control ((obj setting-control) (arg0 process) (arg1 symbol) (arg2 object) (arg3 object) (arg4 object))
(add-connection (-> obj engine) arg0 arg1 arg2 arg3 arg4)
0
(none)
@@ -202,8 +202,8 @@
;; definition for method 10 of type setting-control
;; INFO: Return type mismatch int vs none.
(defmethod set-setting! setting-control ((obj setting-control) (arg0 process) (arg1 symbol) (arg2 symbol) (arg3 float) (arg4 int))
(clear-pending-settings-from-process obj arg0 arg1)
(defmethod set-setting setting-control ((obj setting-control) (arg0 process) (arg1 symbol) (arg2 object) (arg3 object) (arg4 object))
(remove-setting obj arg0 arg1)
(add-connection (-> obj engine) arg0 arg1 arg2 arg3 arg4)
0
(none)
@@ -211,7 +211,7 @@
;; definition for method 11 of type setting-control
;; INFO: Return type mismatch int vs none.
(defmethod clear-pending-settings-from-process setting-control ((obj setting-control) (arg0 process) (arg1 symbol))
(defmethod remove-setting setting-control ((obj setting-control) (arg0 process) (arg1 symbol))
(when arg0
(let ((s5-0 (-> obj engine))
(s4-0 (-> arg0 connection-list next1))
@@ -231,7 +231,7 @@
)
;; definition for method 12 of type setting-control
(defmethod copy-settings-from-target! setting-control ((obj setting-control))
(defmethod apply-settings setting-control ((obj setting-control))
(let ((gp-0 (-> obj current)))
(let ((s5-0 (-> obj target)))
(mem-copy! (the-as pointer s5-0) (the-as pointer (-> obj default)) 196)
@@ -263,8 +263,8 @@
)
;; definition for method 13 of type setting-control
(defmethod update-per-frame-settings! setting-control ((obj setting-control))
(copy-settings-from-target! obj)
(defmethod update setting-control ((obj setting-control))
(apply-settings obj)
(let ((gp-0 (-> obj current)))
(let ((s5-1 (-> obj target)))
(when *sound-player-enable*
test/decompiler/reference/engine/game/task/process-taskable_REF.gc
Generated Vendored
+60 -69
View File
@@ -152,56 +152,54 @@
;; definition for method 46 of type process-taskable
;; INFO: Return type mismatch int vs none.
(defmethod dummy-46 process-taskable ((obj process-taskable))
(with-pp
(when (nonzero? (-> obj sound-flava))
(let ((s5-1 (vector-!
(new 'stack-no-clear 'vector)
(target-pos 0)
(the-as vector (-> obj root-override root-prim prim-core))
)
(when (nonzero? (-> obj sound-flava))
(let ((s5-1 (vector-!
(new 'stack-no-clear 'vector)
(target-pos 0)
(the-as vector (-> obj root-override root-prim prim-core))
)
)
(set! (-> s5-1 y) (* 4.0 (-> s5-1 y)))
(cond
((< (vector-length s5-1) 102400.0)
(when (not (-> obj have-flava))
(set! (-> obj have-flava) #t)
(set-setting! *setting-control* pp 'sound-flava #f 20.0 (the-as int (-> obj sound-flava)))
)
)
((-> obj have-flava)
(clear-pending-settings-from-process *setting-control* pp 'sound-flava)
(set! (-> obj have-flava) #f)
)
)
)
(set! (-> s5-1 y) (* 4.0 (-> s5-1 y)))
(cond
((< (vector-length s5-1) 102400.0)
(when (not (-> obj have-flava))
(set! (-> obj have-flava) #t)
(set-setting! 'sound-flava #f 20.0 (-> obj sound-flava))
)
)
((-> obj have-flava)
(remove-setting! 'sound-flava)
(set! (-> obj have-flava) #f)
)
)
)
(when (-> obj music)
(let ((s5-3 (vector-!
(new 'stack-no-clear 'vector)
(target-pos 0)
(the-as vector (-> obj root-override root-prim prim-core))
)
)
)
(set! (-> s5-3 y) (* 4.0 (-> s5-3 y)))
(cond
((< (vector-length s5-3) 102400.0)
(when (not (-> obj have-music))
(set! (-> obj have-music) #t)
(set-setting! *setting-control* pp 'music (-> obj music) 0.0 0)
)
)
((-> obj have-music)
(clear-pending-settings-from-process *setting-control* pp 'music)
(set! (-> obj have-music) #f)
)
)
)
)
0
(none)
)
(when (-> obj music)
(let ((s5-3 (vector-!
(new 'stack-no-clear 'vector)
(target-pos 0)
(the-as vector (-> obj root-override root-prim prim-core))
)
)
)
(set! (-> s5-3 y) (* 4.0 (-> s5-3 y)))
(cond
((< (vector-length s5-3) 102400.0)
(when (not (-> obj have-music))
(set! (-> obj have-music) #t)
(set-setting! 'music (-> obj music) 0.0 0)
)
)
((-> obj have-music)
(remove-setting! 'music)
(set! (-> obj have-music) #f)
)
)
)
)
0
(none)
)
;; definition for method 31 of type process-taskable
@@ -454,16 +452,9 @@
(send-event (ppointer->process (-> *target* sidekick)) 'matrix 'play-anim)
(send-event *target* 'blend-shape #t)
)
(push-setting! *setting-control* self 'music-volume 'rel (-> *setting-control* current music-volume-movie) 0)
(push-setting! *setting-control* self 'sfx-volume 'rel (-> *setting-control* current sfx-volume-movie) 0)
(push-setting!
*setting-control*
self
'ambient-volume
'rel
(-> *setting-control* current ambient-volume-movie)
0
)
(add-setting! 'music-volume 'rel (-> *setting-control* current music-volume-movie) 0)
(add-setting! 'sfx-volume 'rel (-> *setting-control* current sfx-volume-movie) 0)
(add-setting! 'ambient-volume 'rel (-> *setting-control* current ambient-volume-movie) 0)
(if (-> self blend-on-exit)
(set! (-> self blend-on-exit) arg0)
)
@@ -481,9 +472,9 @@
(the-as (function process-drawable symbol) false-func)
)
)
(clear-pending-settings-from-process *setting-control* self 'music-volume)
(clear-pending-settings-from-process *setting-control* self 'sfx-volume)
(clear-pending-settings-from-process *setting-control* self 'ambient-volume)
(remove-setting! 'music-volume)
(remove-setting! 'sfx-volume)
(remove-setting! 'ambient-volume)
(send-event *target* 'blend-shape #f)
)
(else
@@ -666,8 +657,8 @@
(defbehavior process-taskable-clean-up-after-talking process-taskable ()
(logclear! (-> self draw status) (draw-status hidden))
(logclear! (-> self skel status) (janim-status inited))
(clear-pending-settings-from-process *setting-control* self 'border-mode)
(clear-pending-settings-from-process *setting-control* self 'talking)
(remove-setting! 'border-mode)
(remove-setting! 'talking)
(none)
)
@@ -938,9 +929,9 @@
(logior! (-> self skel status) (janim-status inited))
(logclear! (-> self mask) (process-mask actor-pause))
(process-entity-status! self (entity-perm-status bit-3) #t)
(set-setting! *setting-control* self 'border-mode #f 0.0 0)
(set-setting! *setting-control* self 'talking (the-as symbol (process->ppointer self)) 0.0 0)
(copy-settings-from-target! *setting-control*)
(set-setting! 'border-mode #f 0.0 0)
(set-setting! 'talking (process->ppointer self) 0.0 0)
(apply-settings *setting-control*)
)
)
(none)
@@ -1235,10 +1226,10 @@
(('logo)
)
(else
(push-setting! *setting-control* self 'process-mask 'set 0.0 (-> self mask-to-clear))
(push-setting! *setting-control* self 'movie (process->ppointer self) 0.0 0)
(add-setting! 'process-mask 'set 0.0 (-> self mask-to-clear))
(add-setting! 'movie (process->ppointer self) 0.0 0)
(if (not (-> self border-value))
(push-setting! *setting-control* self 'border-mode (-> self border-value) 0.0 0)
(add-setting! 'border-mode (-> self border-value) 0.0 0)
)
)
)
@@ -1252,12 +1243,12 @@
(vector-normalize-copy! (-> self old-mat-z) (-> v1-19 vector 2) -1.0)
)
)
(copy-settings-from-target! *setting-control*)
(apply-settings *setting-control*)
(none)
)
:exit (behavior ()
(clear-pending-settings-from-process *setting-control* self 'process-mask)
(copy-settings-from-target! *setting-control*)
(remove-setting! 'process-mask)
(apply-settings *setting-control*)
(none)
)
:code (behavior ()
test/decompiler/reference/engine/game/voicebox_REF.gc
Generated Vendored
+2 -2
View File
@@ -149,7 +149,7 @@
(none)
)
:code (behavior ()
(set-setting! *setting-control* self 'sound-flava #f 20.0 6)
(set-setting! 'sound-flava #f 20.0 (music-flava assistant))
(if (and *target* (logtest? (-> *target* control root-prim prim-core action) (collide-action ca-9)))
(send-event
(ppointer->process (-> self parent-override))
@@ -198,7 +198,7 @@
:virtual #t
:trans voicebox-track
:code (behavior ()
(clear-pending-settings-from-process *setting-control* self 'sound-flava)
(remove-setting! 'sound-flava)
(set! (-> self state-time) (-> *display* base-frame-counter))
(set! (-> self seeker target) 1.0)
(while (and (< (-> self blend) 0.9999)
test/decompiler/reference/engine/level/level_REF.gc
Generated Vendored
+1 -1
View File
@@ -1500,7 +1500,7 @@
(defmethod level-update level-group ((obj level-group))
(camera-pos)
(new 'static 'boxed-array :type symbol :length 0 :allocated-length 2)
(update-per-frame-settings! *setting-control*)
(update *setting-control*)
(update *art-control* #t)
(clear-rec *art-control*)
(dotimes (s5-0 2)
test/decompiler/reference/engine/level/load-boundary_REF.gc
Generated Vendored
+2 -9
View File
@@ -2062,17 +2062,10 @@
)
)
((= v1-4 'setting-reset)
(set-setting!
*setting-control*
pp
(the-as symbol (command-get-param (car gp-0) #f))
(the-as symbol (command-get-param (car (cdr gp-0)) #f))
0.0
0
)
(set-setting! (the-as symbol (command-get-param (car gp-0) #f)) (command-get-param (car (cdr gp-0)) #f) 0.0 0)
)
((= v1-4 'setting-unset)
(clear-pending-settings-from-process *setting-control* pp (the-as symbol (command-get-param (car gp-0) #f)))
(remove-setting! (the-as symbol (command-get-param (car gp-0) #f)))
)
((= v1-4 'blackout)
(set-blackout-frames (the-as time-frame (the int (* 5.0000005 (the float (command-get-int (car gp-0) 0))))))
test/decompiler/reference/engine/load/loader_REF.gc
Generated Vendored
+3 -3
View File
@@ -824,11 +824,11 @@
(set! sv-56 0)
(set! spool-sound (new-sound-id))
(backup-load-state-and-set-cmds *load-state* (-> arg0 command-list))
(set-setting! *setting-control* self 'spooling (the-as symbol (process->ppointer self)) 0.0 0)
(set-setting! 'spooling (process->ppointer self) 0.0 0)
(logior! (-> self skel status) (janim-status inited drawn done))
(kill-current-level-hint '() '() 'die)
(level-hint-surpress!)
(copy-settings-from-target! *setting-control*)
(apply-settings *setting-control*)
(when (or (handle->process (-> *art-control* spool-lock)) (!= *master-mode* 'game))
(cond
(arg1
@@ -963,7 +963,7 @@
(if (zero? (logand (-> self skel status) (janim-status inited)))
(logclear! (-> self skel status) (janim-status inited))
)
(clear-pending-settings-from-process *setting-control* self 'spooling)
(remove-setting! 'spooling)
(cond
((and arg1 (>= arg2 0))
(ja-channel-push! 1 (seconds 0.1))
test/decompiler/reference/engine/sound/gsound_REF.gc
Generated Vendored
+4 -6
View File
@@ -593,12 +593,10 @@
;; definition for function sound-volume-off
(defun sound-volume-off ()
(with-pp
(set-setting! *setting-control* pp 'music-volume 'abs 0.0 0)
(set-setting! *setting-control* pp 'sfx-volume 'abs 0.0 0)
(set-setting! *setting-control* pp 'ambient-volume 'abs 0.0 0)
0
)
(set-setting! 'music-volume 'abs 0.0 0)
(set-setting! 'sfx-volume 'abs 0.0 0)
(set-setting! 'ambient-volume 'abs 0.0 0)
0
)
;; definition for symbol *ambient-spec*, type sound-spec
test/decompiler/reference/engine/target/logic-target_REF.gc
Generated Vendored
+3 -3
View File
@@ -1985,9 +1985,9 @@
;; INFO: Return type mismatch object vs none.
;; Used lq/sq
(defbehavior init-target target ((arg0 continue-point))
(set-setting! *setting-control* self 'allow-pause #f 0.0 0)
(set-setting! *setting-control* self 'allow-progress #f 0.0 0)
(copy-settings-from-target! *setting-control*)
(set-setting! 'allow-pause #f 0.0 0)
(set-setting! 'allow-progress #f 0.0 0)
(apply-settings *setting-control*)
(if (not arg0)
(set! arg0 (get-or-create-continue! *game-info*))
)
test/decompiler/reference/engine/target/target-death_REF.gc
Generated Vendored
+18 -18
View File
@@ -49,13 +49,13 @@
(set! (-> *level* border?) (-> *level* play?))
(set! (-> *setting-control* default border-mode) (-> *level* play?))
)
(clear-pending-settings-from-process *setting-control* self 'allow-pause)
(clear-pending-settings-from-process *setting-control* self 'allow-progress)
(clear-pending-settings-from-process *setting-control* self 'bg-a)
(clear-pending-settings-from-process *setting-control* self 'music-volume)
(clear-pending-settings-from-process *setting-control* self 'sfx-volume)
(clear-pending-settings-from-process *setting-control* self 'ambient-volume)
(clear-pending-settings-from-process *setting-control* self 'music)
(remove-setting! 'allow-pause)
(remove-setting! 'allow-progress)
(remove-setting! 'bg-a)
(remove-setting! 'music-volume)
(remove-setting! 'sfx-volume)
(remove-setting! 'ambient-volume)
(remove-setting! 'music)
(none)
)
:code (behavior ((arg0 continue-point))
@@ -63,14 +63,14 @@
(if (-> *art-control* reserve-buffer)
(reserve-free *art-control* (-> *art-control* reserve-buffer heap))
)
(push-setting! *setting-control* self 'bg-a 'abs 1.0 0)
(add-setting! 'bg-a 'abs 1.0 0)
(set! (-> *setting-control* current bg-a) 1.0)
(set-setting! *setting-control* self 'sfx-volume 'abs (the-as float 0.0) 0)
(set-setting! *setting-control* self 'ambient-volume 'abs (the-as float 0.0) 0)
(set-setting! 'sfx-volume 'abs 0.0 0)
(set-setting! 'ambient-volume 'abs 0.0 0)
(let ((v1-20 (lookup-level-info (-> arg0 level))))
(when v1-20
(set-setting! *setting-control* self 'music (-> v1-20 music-bank) (the-as float 0.0) 0)
(set-setting! *setting-control* self 'music-volume 'abs (the-as float 0.0) 0)
(set-setting! 'music (-> v1-20 music-bank) 0.0 0)
(set-setting! 'music-volume 'abs 0.0 0)
)
)
(set! (-> *level* border?) #f)
@@ -115,7 +115,7 @@
(= (-> *setting-control* current music) (-> v1-52 music-bank))
(zero? (logand (-> arg0 flags) (continue-flags sage-intro title)))
)
(clear-pending-settings-from-process *setting-control* self 'music-volume)
(remove-setting! 'music-volume)
)
)
(suspend)
@@ -1056,8 +1056,8 @@
:exit (behavior ()
(logclear! (-> self state-flags) (state-flags sf03 sf15))
(target-exit)
(clear-pending-settings-from-process *setting-control* self 'process-mask)
(clear-pending-settings-from-process *setting-control* self 'allow-progress)
(remove-setting! 'process-mask)
(remove-setting! 'allow-progress)
(restore-collide-with-as (-> self control))
(set! (-> self control pat-ignore-mask) (new 'static 'pat-surface :noentity #x1))
(set! (-> self control dynam gravity-max) (-> self control unknown-dynamics00 gravity-max))
@@ -1072,8 +1072,8 @@
)
(set! (-> self neck flex-blend) 0.0)
(target-timed-invulnerable-off self)
(set-setting! *setting-control* self 'process-mask 'set (the-as float 0.0) #x14a0000)
(copy-settings-from-target! *setting-control*)
(set-setting! 'process-mask 'set 0.0 (process-mask enemy platform projectile death))
(apply-settings *setting-control*)
(set! (-> self control transv quad) (the-as uint128 0))
(logior! (-> self state-flags) (state-flags sf15))
(case arg0
@@ -1319,7 +1319,7 @@
(-> *death-spool-array* (death-movie-remap (-> *game-info* death-movie-tick) (-> *death-spool-array* length)))
)
)
(set-setting! *setting-control* self 'allow-progress #f (the-as float 0.0) 0)
(set-setting! 'allow-progress #f 0.0 0)
(target-death-anim gp-18)
(when (and (< (rand-vu-int-count (-> *game-info* death-movie-tick)) (* (-> *death-spool-array* length) 2))
(zero? (logand (-> self water flags) (water-flags wt09)))
test/decompiler/reference/engine/target/target2_REF.gc
Generated Vendored
+24 -53
View File
@@ -24,7 +24,7 @@
(until (ja-done? 0)
(TODO-RENAME-9 (-> self align))
(TODO-RENAME-10 (-> self align) 4 (the-as float 1.0) (the-as float 1.0) (the-as float 1.0))
(send-event *camera* 'joystick (-> (new 'static 'array int32 1 0) 0) (-> (new 'static 'array int32 1 0) 0))
(send-event *camera* 'joystick 0.0 0.0)
(suspend)
(ja :num! (seek!))
)
@@ -311,7 +311,7 @@
(set! (-> self particles gp-0 part matrix) (sprite-allocate-user-hvdf))
)
)
(set-setting! *setting-control* self 'common-page 'set (the-as float (-> (new 'static 'array int32 1 0) 0)) 1)
(set-setting! 'common-page 'set 0.0 1)
(suspend)
(go hud-coming-in)
(suspend)
@@ -823,7 +823,7 @@
(none)
)
:code (behavior ()
(set-forward-vel (the-as float (-> (new 'static 'array int32 1 0) 0)))
(set-forward-vel (the-as float 0.0))
(let ((gp-0 0))
(while (zero? (logand (-> self control status) (cshape-moving-flags onsurf)))
(target-falling-anim-trans)
@@ -954,7 +954,7 @@
(set! (-> self state-time) (-> *display* base-frame-counter))
(set! (-> self control unknown-surface00) *pole-mods*)
(logior! (-> self control root-prim prim-core action) (collide-action ca-8))
(target-collide-set! 'pole (the-as float (-> (new 'static 'array int32 1 0) 0)))
(target-collide-set! 'pole (the-as float 0.0))
(set! (-> self control unknown-vector102 quad) (-> self control transv quad))
(set! (-> self control transv quad) (the-as uint128 0))
(send-event *camera* 'ease-in)
@@ -962,7 +962,7 @@
(none)
)
:exit (behavior ()
(target-collide-set! 'normal (the-as float (-> (new 'static 'array int32 1 0) 0)))
(target-collide-set! 'normal (the-as float 0.0))
(logclear! (-> self control root-prim prim-core action) (collide-action ca-8))
(set! (-> self control unknown-handle10) (the-as handle #f))
(none)
@@ -1630,7 +1630,7 @@
)
:frame-num (ja-aframe
(the-as float (if (= arg1 (-> *FACT-bank* eco-full-inc))
(-> (new 'static 'array int32 1 0) 0)
0.0
6.0
)
)
@@ -1850,7 +1850,7 @@
(f28-0 0.0)
(f26-0 (lerp-scale
(the-as float 1.0)
(the-as float (-> (new 'static 'array int32 1 0) 0))
(the-as float 0.0)
(-> self control unknown-float01)
(the-as float 16384.0)
(the-as float 32768.0)
@@ -1892,7 +1892,7 @@
)
(let* ((f0-30 (- (-> self water height) (-> self control trans y)))
(f24-1 (lerp-scale
(the-as float (-> (new 'static 'array int32 1 0) 0))
(the-as float 0.0)
(the-as float 1.0)
f0-30
(lerp (-> self water wade-height) (-> self water swim-height) (the-as float 0.25))
@@ -1912,7 +1912,7 @@
f26-0
(lerp-scale
(the-as float 1.0)
(the-as float (-> (new 'static 'array int32 1 0) 0))
(the-as float 0.0)
(-> self control unknown-float01)
(the-as float 16384.0)
(the-as float 32768.0)
@@ -1926,7 +1926,7 @@
)
)
)
(ja :chan 5 :frame-interp (lerp f26-0 (the-as float (-> (new 'static 'array int32 1 0) 0)) f24-1))
(ja :chan 5 :frame-interp (lerp f26-0 (the-as float 0.0) f24-1))
)
(ja :chan 1 :num! (chan 0))
(ja :chan 2 :num! (chan 0))
@@ -1996,11 +1996,7 @@
(set! (-> self control unknown-float00) (fabs (-> self control unknown-float130)))
(if (= (-> self next-state name) 'target-swim-down)
(seek! (-> self control unknown-float131) (the-as float -6144.0) (* 4096.0 (-> *display* seconds-per-frame)))
(seek!
(-> self control unknown-float131)
(the-as float (-> (new 'static 'array int32 1 0) 0))
(* 2048.0 (-> *display* seconds-per-frame))
)
(seek! (-> self control unknown-float131) (the-as float 0.0) (* 2048.0 (-> *display* seconds-per-frame)))
)
(let ((f0-20 (-> self control unknown-float131)))
(set! (-> self control unknown-vector11 y) f0-20)
@@ -2081,12 +2077,7 @@
)
(go target-swim-walk)
)
(target-swim-tilt
(the-as float (-> (new 'static 'array int32 1 0) 0))
(the-as float 2.0)
(the-as float (-> (new 'static 'array int32 1 0) 0))
(the-as float 1.0)
)
(target-swim-tilt (the-as float 0.0) (the-as float 2.0) (the-as float 0.0) (the-as float 1.0))
(none)
)
:code (behavior ()
@@ -2203,12 +2194,7 @@
(set! (-> self control unknown-uint20) (the-as uint (-> *display* base-frame-counter)))
)
)
(target-swim-tilt
(the-as float (-> (new 'static 'array int32 1 0) 0))
(the-as float 2.0)
(the-as float (-> (new 'static 'array int32 1 0) 0))
(the-as float 1.0)
)
(target-swim-tilt (the-as float 0.0) (the-as float 2.0) (the-as float 0.0) (the-as float 1.0))
(none)
)
:code (behavior ()
@@ -2309,23 +2295,13 @@
((>= (- (-> *display* base-frame-counter) (-> self control unknown-dword11)) (seconds 0.1))
(set! (-> self control unknown-surface00) *dive-mods*)
(if (= (-> self next-state name) 'target-swim-down)
(target-swim-tilt
(the-as float -0.9)
(the-as float 1.0)
(the-as float (-> (new 'static 'array int32 1 0) 0))
(the-as float 0.5)
)
(target-swim-tilt (the-as float -0.9) (the-as float 1.0) (the-as float 0.0) (the-as float 0.5))
)
)
(else
(set! (-> self control unknown-surface00) *dive-bottom-mods*)
(if (or (= (-> self next-state name) 'target-swim-down) (= (-> self next-state name) 'target-swim-stance))
(target-swim-tilt
(the-as float (-> (new 'static 'array int32 1 0) 0))
(the-as float 2.0)
(the-as float -1.0)
(the-as float 1.0)
)
(target-swim-tilt (the-as float 0.0) (the-as float 2.0) (the-as float -1.0) (the-as float 1.0))
)
)
)
@@ -2406,9 +2382,7 @@
(f26-0 f28-0)
(f24-1 (+ f24-0 f30-0))
)
(set! f30-0
(seek f30-0 (the-as float (-> (new 'static 'array int32 1 0) 0)) (* 32768.0 (-> *display* seconds-per-frame)))
)
(set! f30-0 (seek f30-0 (the-as float 0.0) (* 32768.0 (-> *display* seconds-per-frame))))
(vector+!
(-> self control transv)
(vector-float*! (-> self control transv) (-> self control dynam gravity-normal) f24-1)
@@ -2421,7 +2395,7 @@
(the-as float 0.4)
(the-as float 1.0)
(vector-length (-> self control transv))
(the-as float (-> (new 'static 'array int32 1 0) 0))
(the-as float 0.0)
(the-as float 16384.0)
)
)
@@ -2467,11 +2441,11 @@
(target-swim-tilt
(the-as float (if (< 8192.0 (-> self water swim-depth))
0.5
(-> (new 'static 'array int32 1 0) 0)
0.0
)
)
(the-as float 1.0)
(the-as float (-> (new 'static 'array int32 1 0) 0))
(the-as float 0.0)
(the-as float 0.1)
)
(if (and (zero? (logand (-> self water flags) (water-flags wt12)))
@@ -2500,11 +2474,11 @@
(target-swim-tilt
(the-as float (if (< 8192.0 (-> self water swim-depth))
0.3
(-> (new 'static 'array int32 1 0) 0)
0.0
)
)
(the-as float 1.0)
(the-as float (-> (new 'static 'array int32 1 0) 0))
(the-as float 0.0)
(the-as float 0.1)
)
(if (zero? (logand (-> self water flags) (water-flags wt12)))
@@ -2611,7 +2585,7 @@
:enter (behavior ((arg0 float))
(set! (-> self control unknown-dword31) 0)
(set! (-> self control unknown-dword33) 0)
(set-forward-vel (the-as float (-> (new 'static 'array int32 1 0) 0)))
(set-forward-vel (the-as float 0.0))
(set! (-> self control unknown-surface00) *walk-mods*)
(none)
)
@@ -2672,7 +2646,7 @@
(set! (-> self state-time) (-> *display* base-frame-counter))
(set! (-> self control unknown-surface00) *turn-around-mods*)
(ja-channel-push! 1 (seconds 0.15))
(set-forward-vel (the-as float (-> (new 'static 'array int32 1 0) 0)))
(set-forward-vel (the-as float 0.0))
(ja-no-eval :group! eichar-duck-stance-ja :num! (seek! (ja-aframe (the-as float 15.0) 0) 3.0) :frame-num 0.0)
(until (ja-done? 0)
(suspend)
@@ -2699,10 +2673,7 @@
((and sv-44
(< (- (-> (the-as target s4-0) control trans y) (-> (the-as target s4-0) control unknown-vector52 y)) arg2)
)
(vector-xz-normalize!
(-> (the-as target s4-0) control transv)
(the-as float (-> (new 'static 'array int32 1 0) 0))
)
(vector-xz-normalize! (-> (the-as target s4-0) control transv) (the-as float 0.0))
(case (-> (the-as target s4-0) current-level name)
(('jungleb)
(let ((v1-16 (vector-! (new-stack-vector0) (-> (the-as target s4-0) control trans) sv-40)))
test/decompiler/reference/engine/ui/progress/progress_REF.gc
Generated Vendored
+6 -6
View File
@@ -857,7 +857,7 @@
;; INFO: Return type mismatch int vs none.
(defun deactivate-progress ()
(when (and *progress-process* (= (-> *progress-process* 0 next-state name) 'progress-gone))
(copy-settings-from-target! *setting-control*)
(apply-settings *setting-control*)
(dotimes (gp-0 (-> *progress-process* 0 nb-of-particles))
(kill-and-free-particles (-> *progress-process* 0 particles gp-0 part))
(set! (-> *progress-process* 0 particles gp-0 part matrix) -1)
@@ -1103,7 +1103,7 @@
(set! (-> self particles gp-0 part matrix) (sprite-allocate-user-hvdf))
)
)
(set-setting! *setting-control* self 'common-page 'set (the-as float 0.0) 1)
(set-setting! 'common-page 'set 0.0 1)
(suspend)
(go progress-coming-in)
)
@@ -1116,8 +1116,8 @@
;; failed to figure out what this is:
(defstate progress-gone (progress)
:code (behavior ()
(clear-pending-settings-from-process *setting-control* self 'process-mask)
(copy-settings-from-target! *setting-control*)
(remove-setting! 'process-mask)
(apply-settings *setting-control*)
(logior! (-> self mask) (process-mask sleep))
(suspend)
0
@@ -2417,8 +2417,8 @@
:enter (behavior ()
(sound-group-pause (the-as uint 255))
(logclear! (-> *setting-control* default process-mask) (process-mask pause menu))
(push-setting! *setting-control* self 'process-mask 'set 0.0 16)
(copy-settings-from-target! *setting-control*)
(add-setting! 'process-mask 'set 0.0 (process-mask progress))
(apply-settings *setting-control*)
(sound-play-by-name (static-sound-name "select-menu") (new-sound-id) 1024 0 0 1 #t)
(set-blackout-frames 0)
(set! *pause-lock* #f)