mirror of
https://github.com/open-goal/jak-project
synced 2026-07-10 23:22:17 -04:00
[decomp] improve types around enter-state (#923)
* clean up * restore hack
This commit is contained in:
+38
-46
@@ -1249,55 +1249,46 @@
|
||||
)
|
||||
|
||||
;; definition for function anim-tester-standard-event-handler
|
||||
;; INFO: Return type mismatch none vs object.
|
||||
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
|
||||
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
|
||||
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
|
||||
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
|
||||
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
|
||||
(defbehavior
|
||||
anim-tester-standard-event-handler anim-tester
|
||||
((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block))
|
||||
(let ((v1-0 arg2))
|
||||
(the-as object (cond
|
||||
((= v1-0 'reset)
|
||||
(process-disconnect self)
|
||||
(set! (-> self flags) (logand -2 (-> self flags)))
|
||||
(when (!= (-> *anim-tester* 0 edit-mode) 1)
|
||||
(set! (-> *debug-menu-context* is-hidden) #f)
|
||||
(set! (-> *anim-tester* 0 edit-mode) 0)
|
||||
(set! *camera-read-buttons* #t)
|
||||
)
|
||||
(anim-tester-reset)
|
||||
(go anim-tester-process)
|
||||
)
|
||||
((= v1-0 'change-anim)
|
||||
(go anim-tester-process)
|
||||
)
|
||||
((= v1-0 'pick-object)
|
||||
(set! (-> self edit-mode) 1)
|
||||
(set! *camera-read-buttons* #f)
|
||||
#f
|
||||
)
|
||||
((= v1-0 'pick-joint-anim)
|
||||
(set! (-> self edit-mode) 2)
|
||||
(set! *camera-read-buttons* #f)
|
||||
#f
|
||||
)
|
||||
((= v1-0 'pick-sequence)
|
||||
(set! (-> self edit-mode) 3)
|
||||
(set! *camera-read-buttons* #f)
|
||||
#f
|
||||
)
|
||||
((= v1-0 'edit-sequence)
|
||||
(set! (-> self edit-mode) 4)
|
||||
(set! *camera-read-buttons* #f)
|
||||
#f
|
||||
)
|
||||
((= v1-0 'save-sequences)
|
||||
(anim-tester-save-all-objects self)
|
||||
)
|
||||
)
|
||||
(case arg2
|
||||
(('reset)
|
||||
(process-disconnect self)
|
||||
(set! (-> self flags) (logand -2 (-> self flags)))
|
||||
(when (!= (-> *anim-tester* 0 edit-mode) 1)
|
||||
(set! (-> *debug-menu-context* is-hidden) #f)
|
||||
(set! (-> *anim-tester* 0 edit-mode) 0)
|
||||
(set! *camera-read-buttons* #t)
|
||||
)
|
||||
(anim-tester-reset)
|
||||
(go anim-tester-process)
|
||||
)
|
||||
(('change-anim)
|
||||
(go anim-tester-process)
|
||||
)
|
||||
(('pick-object)
|
||||
(set! (-> self edit-mode) 1)
|
||||
(set! *camera-read-buttons* #f)
|
||||
#f
|
||||
)
|
||||
(('pick-joint-anim)
|
||||
(set! (-> self edit-mode) 2)
|
||||
(set! *camera-read-buttons* #f)
|
||||
#f
|
||||
)
|
||||
(('pick-sequence)
|
||||
(set! (-> self edit-mode) 3)
|
||||
(set! *camera-read-buttons* #f)
|
||||
#f
|
||||
)
|
||||
(('edit-sequence)
|
||||
(set! (-> self edit-mode) 4)
|
||||
(set! *camera-read-buttons* #f)
|
||||
#f
|
||||
)
|
||||
(('save-sequences)
|
||||
(anim-tester-save-all-objects self)
|
||||
)
|
||||
)
|
||||
)
|
||||
@@ -3259,6 +3250,7 @@
|
||||
)
|
||||
|
||||
;; definition for function initialize-anim-tester
|
||||
;; INFO: Return type mismatch object vs none.
|
||||
(defbehavior initialize-anim-tester anim-tester ()
|
||||
(glst-init-list! (-> self obj-list))
|
||||
(logclear! (-> self mask) (process-mask menu))
|
||||
|
||||
Reference in New Issue
Block a user