mirror of
https://github.com/open-goal/jak-project
synced 2026-08-04 01:04:11 -04:00
fix a game bug and add a new compiler feature (#1758)
* dont crash on inline static value array * [goalc] add support for non-static inline arrays of values * add a kernel group to jak1 * move and cleanup pc debug code * random cleanup in `hud-classes` * pc port fix for gondola spools * format * address feedback (wow it was actually just changing 1 line all along...) * minor decomp cleanup * ref test
This commit is contained in:
+5
-21
@@ -713,30 +713,19 @@
|
||||
)
|
||||
|
||||
;; definition for function target-hit-setup-anim
|
||||
;; INFO: Return type mismatch object vs none.
|
||||
(defbehavior target-hit-setup-anim target ((arg0 attack-info))
|
||||
(case (-> arg0 angle)
|
||||
(('back)
|
||||
(when (not (ja-group? eichar-hit-from-back-ja))
|
||||
(ja-channel-push! 1 (seconds 0.075))
|
||||
(let ((gp-1 (-> self skel root-channel 0)))
|
||||
(joint-control-channel-group-eval! gp-1 (the-as art-joint-anim eichar-hit-from-back-ja) num-func-identity)
|
||||
(let ((f0-0 0.0))
|
||||
(set! (-> gp-1 frame-num) f0-0)
|
||||
f0-0
|
||||
)
|
||||
)
|
||||
(ja :group! eichar-hit-from-back-ja :num! min)
|
||||
)
|
||||
)
|
||||
(('up 'up-forward)
|
||||
(when (not (ja-group? eichar-hit-up-ja))
|
||||
(ja-channel-push! 1 (seconds 0.075))
|
||||
(let ((gp-2 (-> self skel root-channel 0)))
|
||||
(joint-control-channel-group-eval! gp-2 (the-as art-joint-anim eichar-hit-up-ja) num-func-identity)
|
||||
(let ((f0-1 0.0))
|
||||
(set! (-> gp-2 frame-num) f0-1)
|
||||
f0-1
|
||||
)
|
||||
)
|
||||
(ja :group! eichar-hit-up-ja :num! min)
|
||||
)
|
||||
)
|
||||
(('air 'jump)
|
||||
@@ -756,16 +745,11 @@
|
||||
(else
|
||||
(when (not (ja-group? eichar-hit-from-front-ja))
|
||||
(ja-channel-push! 1 (seconds 0.075))
|
||||
(let ((gp-5 (-> self skel root-channel 0)))
|
||||
(joint-control-channel-group-eval! gp-5 (the-as art-joint-anim eichar-hit-from-front-ja) num-func-identity)
|
||||
(let ((f0-10 0.0))
|
||||
(set! (-> gp-5 frame-num) f0-10)
|
||||
f0-10
|
||||
)
|
||||
)
|
||||
(ja :group! eichar-hit-from-front-ja :num! min)
|
||||
)
|
||||
)
|
||||
)
|
||||
(none)
|
||||
)
|
||||
|
||||
;; definition for function target-hit-move
|
||||
|
||||
Reference in New Issue
Block a user