Hack around failing to find local vars

UnderminersTeam · Oct 13, 2024 · 02102c2 · 02102c2
1 parent d5da084
commit 02102c2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/UndertaleModLib/Decompiler/Assembler.cs b/UndertaleModLib/Decompiler/Assembler.cs
@@ -341,6 +341,8 @@ public static List<UndertaleInstruction> Assemble(string source, IList<Undertale
                     string[] aaa = line.Split(' ');
                     if (aaa[0] == ".localvar")
                     {
+                        if (localvars is null)
+                            throw new Exception("Local variable directive is not supported in this bytecode version");
                         if (aaa.Length >= 4)
                         {
                             var varii = vars[Int32.Parse(aaa[3])];
@@ -526,7 +528,7 @@ private static UndertaleInstruction.Reference<UndertaleVariable> ParseVariableRe
             // Locate variable from either local variables, or VARI chunk
             UndertaleVariable locatedVariable;
             string variableName = str[strPosition..].ToString();
-            if (variInstanceType == UndertaleInstruction.InstanceType.Local)
+            if (variInstanceType == UndertaleInstruction.InstanceType.Local && data?.CodeLocals is not null)
             {
                 locatedVariable = localvars.ContainsKey(variableName) ? localvars[variableName] : null;
             }

diff --git a/UndertaleModLib/UndertaleDataExtensionMethods.cs b/UndertaleModLib/UndertaleDataExtensionMethods.cs
@@ -174,10 +174,12 @@ public static UndertaleVariable EnsureDefined(this IList<UndertaleVariable> list
 
 	public static UndertaleVariable DefineLocal(this IList<UndertaleVariable> list, IList<UndertaleVariable> originalReferencedLocalVars, int localId, string name, IList<UndertaleString> strg, UndertaleData data)
 	{
-		bool bytecode14 = (data?.GeneralInfo?.BytecodeVersion <= 14);
-		if (bytecode14)
+		bool bytecode14 = data?.GeneralInfo?.BytecodeVersion <= 14;
+		if (bytecode14 || data?.CodeLocals is null)
 		{
-			UndertaleVariable search = list.Where((x) => x.Name.Content == name).FirstOrDefault();
+			UndertaleVariable search = list.Where((x) =>
+				x.Name.Content == name && (bytecode14 || x.InstanceType == UndertaleInstruction.InstanceType.Local)
+				).FirstOrDefault();
 			if (search != null)
 				return search;
 		}