fix Boolean casting on temp vars

XDOneDude · Mar 30, 2024 · 88b1fc3 · 88b1fc3
1 parent 725aced
commit 88b1fc3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/UndertaleModLib/Decompiler/Decompiler.cs b/UndertaleModLib/Decompiler/Decompiler.cs
@@ -271,7 +271,7 @@ internal static void DecompileFromBlock(DecompileContext context, Dictionary<uin
                         {
                             Expression val = stack.Pop();
                             if (context.BooleanTypeEnabled && instr.Type1 == UndertaleInstruction.DataType.Boolean) {
-                                val.CastToBoolean();
+                                val.CastToBoolean(context);
                             }
                             stack.Push(new ExpressionCast(instr.Type2, val));
                         }
@@ -296,11 +296,11 @@ internal static void DecompileFromBlock(DecompileContext context, Dictionary<uin
                     case UndertaleInstruction.Opcode.Cmp:
                         Expression aa2 = stack.Pop();
                         if (context.BooleanTypeEnabled && instr.Type1 == UndertaleInstruction.DataType.Boolean) {
-                            aa2.CastToBoolean();
+                            aa2.CastToBoolean(context);
                         }
                         Expression aa1 = stack.Pop();
                         if (context.BooleanTypeEnabled && instr.Type2 == UndertaleInstruction.DataType.Boolean) {
-                            aa1.CastToBoolean();
+                            aa1.CastToBoolean(context);
                         }
                         stack.Push(new ExpressionCompare(instr.ComparisonKind, aa1, aa2));
                         break;
@@ -402,7 +402,7 @@ internal static void DecompileFromBlock(DecompileContext context, Dictionary<uin
                             if (val != null)
                             {
                                 if (context.BooleanTypeEnabled && instr.Type2 == UndertaleInstruction.DataType.Boolean) {
-                                    val.CastToBoolean();
+                                    val.CastToBoolean(context);
                                 }
                                 if ((target.VarType == UndertaleInstruction.VariableType.StackTop || target.VarType == UndertaleInstruction.VariableType.Array) && target.InstType.WasDuplicated)
                                 {

diff --git a/UndertaleModLib/Decompiler/Instructions/Decompiler.Expression.cs b/UndertaleModLib/Decompiler/Instructions/Decompiler.Expression.cs
@@ -54,7 +54,7 @@ internal virtual bool IsDuplicationSafe()
         }
 
         // Used for converting int constants to bool constants for 2.3.7+ code
-        internal virtual void CastToBoolean() {
+        internal virtual void CastToBoolean(DecompileContext context) {
             Type = UndertaleInstruction.DataType.Boolean;
         }
 

diff --git a/UndertaleModLib/Decompiler/Instructions/Decompiler.ExpressionConstant.cs b/UndertaleModLib/Decompiler/Instructions/Decompiler.ExpressionConstant.cs
@@ -28,7 +28,7 @@ internal override bool IsDuplicationSafe()
             return true;
         }
 
-        internal override void CastToBoolean() {
+        internal override void CastToBoolean(DecompileContext context) {
             Type = UndertaleInstruction.DataType.Boolean;
             Value = Convert.ToBoolean(Value);
         }

diff --git a/UndertaleModLib/Decompiler/Instructions/Decompiler.ExpressionTempVar.cs b/UndertaleModLib/Decompiler/Instructions/Decompiler.ExpressionTempVar.cs
@@ -38,6 +38,14 @@ public override Statement CleanStatement(DecompileContext context, BlockHLStatem
             return this;
         }
 
+        internal override void CastToBoolean(DecompileContext context) {
+            Type = UndertaleInstruction.DataType.Boolean;
+            if (context.TempVarMap.ContainsKey(Var.Var.Name))
+            {
+                context.TempVarMap[Var.Var.Name].Value.CastToBoolean(context);
+            }
+        }
+
         internal override AssetIDType DoTypePropagation(DecompileContext context, AssetIDType suggestedType)
         {
             if (Var.Var.AssetType == AssetIDType.Other)