From 0c16d3c3d8cd33efe7a50569019ca95d014312e4 Mon Sep 17 00:00:00 2001 From: water111 <48171810+water111@users.noreply.github.com> Date: Thu, 2 Jun 2022 21:45:09 -0400 Subject: [PATCH] [game] fix daxter stuck face bug (#1409) --- goal_src/engine/target/sidekick.gc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/goal_src/engine/target/sidekick.gc b/goal_src/engine/target/sidekick.gc index fa6e72f12..2e7cac7c2 100644 --- a/goal_src/engine/target/sidekick.gc +++ b/goal_src/engine/target/sidekick.gc @@ -242,6 +242,14 @@ (set! (-> self draw shadow-joint-index) (the-as uint 6)) (set! (-> self draw shadow-ctrl) *target-shadow-control*) (logior! (-> self skel status) (janim-status eye)) + + (#when PC_PORT + ;; daxter can be killed mid-blerc, leaving blerc modifications in the merc data. + ;; once sidekick is restarted, the blerc-done flag will be lost, so the modifications will + ;; to work around this, just set blerc-done on spawn. it will run blerc with 0's on the + ;; first frame when daxter is drawn, clearing blerc data. + (logior! (-> self skel status) (janim-status blerc-done)) + ) (let ((v1-14 (-> self node-list data))) (set! (-> v1-14 0 param0) cspace<-cspace+quaternion!) (set! (-> v1-14 0 param1) (the-as basic (-> self parent-override 0 control unknown-cspace10 parent)))