Fix out-of-order overrides (#1686)

Co-authored-by: ike709 <[email protected]>
OpenDreamProject · Feb 28, 2024 · 62c384c · 62c384c
1 parent 59e85ec
commit 62c384c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Content.Tests/DMProject/Tests/Const/Const_LateDefinition.dm b/Content.Tests/DMProject/Tests/Const/Const_LateDefinition.dm
@@ -8,6 +8,9 @@ var/const/late_defined_const = 1
 	var/a = 1 + const_var
 	var/const/const_var = 2
 
+/obj/TestObj/SubType
+	a = 4 // Catches a regression introduced in #1550
+
 /proc/RunTest()
 	var/obj/TestObj/o = new
 	ASSERT(o.const_var == 2)

diff --git a/DMCompiler/DM/Builders/DMObjectBuilder.cs b/DMCompiler/DM/Builders/DMObjectBuilder.cs
@@ -285,8 +285,7 @@ private static void ProcessVarOverride(DMObject? varObject, DMASTObjectVarOverri
                 variable = varObject.GetGlobalVariable(varOverride.VarName);
                 DMCompiler.Emit(WarningCode.StaticOverride, varOverride.Location, $"var \"{varOverride.VarName}\" cannot be overridden - it is a global var");
             } else {
-                DMCompiler.Emit(WarningCode.ItemDoesntExist, varOverride.Location, $"var \"{varOverride.VarName}\" is not declared");
-                return;
+                throw new UnknownIdentifierException(varOverride.Location, varOverride.VarName);
             }
 
             OverrideVariableValue(varObject, ref variable, varOverride.Value);