mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-08-01 08:27: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/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)