zzre: Fix exception for duplicated labels in scripts

Fixes #277
Helco · Jan 21, 2024 · e31011d · e31011d
1 parent 0dd5f06
commit e31011d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 13 deletions.
diff --git a/zzre/game/components/ScriptExecution.cs b/zzre/game/components/ScriptExecution.cs
@@ -8,7 +8,6 @@ namespace zzre.game.components;
 public class ScriptExecution // reference type as we have to have reference members as well
 {
     public IReadOnlyList<RawInstruction> Instructions { get; }
-    public IReadOnlyDictionary<int, int> LabelTargets { get; }
     public int CurrentI;
 
     public bool HasStopped => CurrentI >= Instructions.Count;
@@ -21,17 +20,27 @@ public ScriptExecution(string script)
             .Select(s => new RawInstruction(s))
             .Select(Compile)
             .ToArray();
-
-        LabelTargets = Instructions
-            .Indexed()
-            .Where(t => t.Value.Command == "$")
-            .ToDictionary(
-                t => int.Parse(t.Value.Arguments.First()),
-                t => t.Index);
     }
 
     // TODO: Replace ScriptExecution ctor with actual compiler
 
+    public bool GoToLabel(int labelId)
+    {
+        int i;
+        for (i = CurrentI; i < Instructions.Count; i++)
+        {
+            if (Instructions[i].Command == "$" &&
+                int.Parse(Instructions[i].Arguments.First()) == labelId)
+                break;
+        }
+        if (i < Instructions.Count)
+        {
+            CurrentI = i;
+            return true;
+        }
+        return false;
+    }
+
     private static RawInstruction Compile(RawInstruction raw) => LongToShortCommand.TryGetValue(raw.Command, out var shortCommand) ?
         new RawInstruction(shortCommand, raw.Arguments)
         : raw;

diff --git a/zzre/game/systems/BaseScript.cs b/zzre/game/systems/BaseScript.cs
@@ -84,22 +84,22 @@ private OpReturn ExecuteSystem(in DefaultEcs.Entity entity, ref components.Scrip
 
             case CmdGoto:
                 var label = int.Parse(instruction.Arguments.Single());
-                script.CurrentI = script.LabelTargets[label];
+                script.GoToLabel(label);
                 return OpReturn.Continue;
 
             case CmdGotoRandomLabel:
                 var range = int.Parse(instruction.Arguments[0]);
                 var start = int.Parse(instruction.Arguments[1]);
                 label = start + Random.Shared.Next(range);
-                script.CurrentI = script.LabelTargets[label];
+                script.GoToLabel(label);
                 return OpReturn.Continue;
 
             case CmdGotoLabelByRandom:
                 // a percentage of *not* jumping to a label -_-
                 var percentage = int.Parse(instruction.Arguments[0]);
                 label = int.Parse(instruction.Arguments[1]);
                 if (Random.Shared.Next(100) >= percentage)
-                    script.CurrentI = script.LabelTargets[label];
+                    script.GoToLabel(label);
                 return OpReturn.Continue;
 
             case CmdSetGlobal:

diff --git a/zzre/game/systems/dialog/DialogChoice.cs b/zzre/game/systems/dialog/DialogChoice.cs
@@ -98,7 +98,7 @@ private void HandleElementDown(DefaultEcs.Entity _, components.ui.ElementId clic
         var dialogChoice = uiEntity.Get<components.DialogChoice>();
         var dialogEntity = dialogChoice.DialogEntity;
         ref var script = ref dialogEntity.Get<components.ScriptExecution>();
-        script.CurrentI = script.LabelTargets[dialogChoice.Labels[choiceI]];
+        script.GoToLabel(dialogChoice.Labels[choiceI]);
         dialogEntity.Set(components.DialogState.NextScriptOp);
         uiEntity.Dispose();
     }

diff --git a/zzre/game/systems/dialog/DialogTalk.cs b/zzre/game/systems/dialog/DialogTalk.cs
@@ -191,7 +191,7 @@ private void HandleElementDown(DefaultEcs.Entity clickedEntity, components.ui.El
             var talkLabels = dialogEntity.Get<components.DialogTalkLabels>();
             int targetLabel = clickedId == IDYes ? talkLabels.LabelYes : talkLabels.LabelNo;
             ref var scriptExec = ref dialogEntity.Get<components.ScriptExecution>();
-            scriptExec.CurrentI = scriptExec.LabelTargets[targetLabel];
+            scriptExec.GoToLabel(targetLabel);
             dialogEntity.Set(components.DialogState.NextScriptOp);
             talkEntity.Dispose();
         }