- moved sc_man and palettecontainer to the 'common' folder.

src/scripting/backend/vmbuilder.cpp

@@ -38,6 +38,8 @@
 #include "c_cvars.h"
 #include "scripting/vm/jit.h"
 
+EXTERN_CVAR(Bool, strictdecorate);
+
 struct VMRemap
 {
 	uint8_t altOp, kReg, kType;
@@ -832,7 +834,7 @@ void FFunctionBuildList::Build()
 			ctx.FunctionArgs.Push(local);
 		}
 
-		FScriptPosition::StrictErrors = !item.FromDecorate;
+		FScriptPosition::StrictErrors = !item.FromDecorate || strictdecorate;
 		item.Code = item.Code->Resolve(ctx);
 		// If we need extra space, load the frame pointer into a register so that we do not have to call the wasteful LFP instruction more than once.
 		if (item.Function->ExtraSpace > 0)
@@ -910,7 +912,7 @@ void FFunctionBuildList::Build()
 		disasmdump.Flush();
 	}
 	VMFunction::CreateRegUseInfo();
-	FScriptPosition::StrictErrors = false;
+	FScriptPosition::StrictErrors = strictdecorate;
 
 	if (FScriptPosition::ErrorCounter == 0 && Args->CheckParm("-dumpjit")) DumpJit();
 	mItems.Clear();

src/scripting/decorate/thingdef_parse.cpp

@@ -53,7 +53,7 @@
 #endif // !_MSC_VER
 
 void ParseOldDecoration(FScanner &sc, EDefinitionType def, PNamespace *ns);
-EXTERN_CVAR(Bool, strictdecorate);
+CVAR(Bool, strictdecorate, false, CVAR_GLOBALCONFIG | CVAR_ARCHIVE)
 
 
 //==========================================================================

src/scripting/symbols.h

@@ -1,6 +1,7 @@
 // Note: This must not be included by anything but dobject.h!
 #pragma once
 
+#include "sc_man.h"
 
 class VMFunction;
 class PType;

src/scripting/thingdef.cpp

@@ -62,6 +62,7 @@ void InitThingdef();
 static TMap<FState *, FScriptPosition> StateSourceLines;
 static FScriptPosition unknownstatesource("unknown file", 0);
 
+EXTERN_CVAR(Bool, strictdecorate);
 
 //==========================================================================
 //
@@ -462,7 +463,7 @@ void LoadActors()
 	FScriptPosition::StrictErrors = true;
 	ParseScripts();
 
-	FScriptPosition::StrictErrors = false;
+	FScriptPosition::StrictErrors = strictdecorate;
 	ParseAllDecorate();
 	SynthesizeFlagFields();