mirror of
https://github.com/open-goal/jak-project
synced 2026-09-09 04:10:23 -04:00
cleanup settings stuff (#1444)
* 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:
+3
-3
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user