Patcher: fix: broken go to labels in script engine

ReneLergner · Oct 22, 2024 · 132e21e · 132e21e
1 parent 1e5da54
commit 132e21e
Showing 1 changed file with 20 additions and 14 deletions.
diff --git a/Patcher/AutoPatcher/ScriptEngine.cs b/Patcher/AutoPatcher/ScriptEngine.cs
@@ -1487,13 +1487,16 @@ private static void IfFoundGo(string Label)
 
             if (FindSuccess)
             {
-                FunctionDescriptor FoundLabel = Labels.Find(l => string.Equals(l.Name, Label, StringComparison.CurrentCultureIgnoreCase));
-                if (FoundLabel == null)
-                    throw new ScriptExecutionException("Label not found: " + Label);
-
-                WriteLog("Condition was found, jumping to label: " + Label);
-                WriteLog("New virtual address: 0x" + FoundLabel.VirtualAddress.ToString("X8"));
-                CurrentVirtualAddressTarget = FoundLabel.VirtualAddress;
+                CodeLine NewLine = ScriptCode.Find(l => string.Equals(l.Label, Label, StringComparison.CurrentCultureIgnoreCase));
+                if (NewLine == null)
+                {
+                    throw new ScriptExecutionException("Label " + Label + " not found");
+                }
+                else
+                {
+                    Pointer = ScriptCode.IndexOf(NewLine);
+                    WriteLog("Go to label: " + Label);
+                }
             }
         }
 
@@ -1504,13 +1507,16 @@ private static void IfNotFoundGo(string Label)
 
             if (!FindSuccess)
             {
-                FunctionDescriptor FoundLabel = Labels.Find(l => string.Equals(l.Name, Label, StringComparison.CurrentCultureIgnoreCase));
-                if (FoundLabel == null)
-                    throw new ScriptExecutionException("Label not found: " + Label);
-
-                WriteLog("Condition was not found, jumping to label: " + Label);
-                WriteLog("New virtual address: 0x" + FoundLabel.VirtualAddress.ToString("X8"));
-                CurrentVirtualAddressTarget = FoundLabel.VirtualAddress;
+                CodeLine NewLine = ScriptCode.Find(l => string.Equals(l.Label, Label, StringComparison.CurrentCultureIgnoreCase));
+                if (NewLine == null)
+                {
+                    throw new ScriptExecutionException("Label " + Label + " not found");
+                }
+                else
+                {
+                    Pointer = ScriptCode.IndexOf(NewLine);
+                    WriteLog("Go to label: " + Label);
+                }
             }
         }