scene: Don't change target in the middle of attacks (#556)

BastianBlokland · Jul 9, 2023 · 79b0b91 · 79b0b91
1 parent c8307dc
commit 79b0b91
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/libs/scene/src/controller.c b/libs/scene/src/controller.c
@@ -54,9 +54,9 @@ ecs_system_define(SceneControllerUpdateSys) {
       target->targetOverride         = script_get_entity(targetOverride, 0);
     }
 
-    // Set attack target.
+    // Set attack target if we are not currently in the middle of firing.
     SceneAttackComp* attack = ecs_view_write_t(itr, SceneAttackComp);
-    if (attack) {
+    if (attack && !(attack->flags & SceneAttackFlags_Firing)) {
       const ScriptVal attackTarget = scene_brain_get(brain, g_brainKeyAttackTarget);
       attack->targetEntity         = script_get_entity(attackTarget, 0);
       scene_brain_set_null(brain, g_brainKeyAttackTarget);