zzre: Fix softlock with changeWaypoint instructions on fairy NPCs

Fixes #278
Helco · Jan 22, 2024 · 736a02c · 736a02c
1 parent 4b9ba81
commit 736a02c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/zzre/game/systems/npc/NPCMovementByDialog.cs b/zzre/game/systems/npc/NPCMovementByDialog.cs
@@ -22,14 +22,14 @@ private void Update(
         components.NPCType npcType,
         Location location,
         ref components.NPCMovement move,
-        ref components.NonFairyAnimation animation,
         in components.NPCIsWalkingByDialog byDialog)
     {
         if (!UpdateWalking(elapsedTime, entity, npcType, location, ref move))
             return;
 
-        if (move.NextWaypointId == -1)
-            animation.Next = zzio.AnimationType.Idle0;
+        var animation = entity.TryGet<components.NonFairyAnimation>();
+        if (move.NextWaypointId == -1 && animation.HasValue)
+            animation.Value.Next = zzio.AnimationType.Idle0;
 
         recorder.Record(entity).Remove<components.NPCIsWalkingByDialog>();
         recorder.Record(byDialog.DialogEntity).Set(components.DialogState.NextScriptOp);