- fixed compilation errors

src/scripting/decorate/thingdef_parse.cpp:80:11: error: no viable conversion from 'const FName' to 'FString' src/scripting/zscript/zcc_compile.cpp:1359:26: error: use of undeclared identifier 'Name_globalfreeze'; did you mean 'NAME_globalfreeze'?
ZDoom · Jan 12, 2019 · c1a4158 · c1a4158
1 parent ed14951
commit c1a4158
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/scripting/decorate/thingdef_parse.cpp b/src/scripting/decorate/thingdef_parse.cpp
@@ -77,7 +77,7 @@ PClassActor *DecoDerivedClass(const FScriptPosition &sc, PClassActor *parent, FN
 	if (type == nullptr)
 	{
 		FString newname = typeName.GetChars();
-		FString sourcefile = sc.FileName;
+		FString sourcefile = sc.FileName.GetChars();
 
 		sourcefile.Substitute(":", "@");
 		newname << '@' << sourcefile;
@@ -1342,4 +1342,4 @@ void ParseAllDecorate()
 		auto ns = Namespaces.NewNamespace(sc.LumpNum);
 		ParseDecorate(sc, ns);
 	}
-}
+}
diff --git a/src/scripting/zscript/zcc_compile.cpp b/src/scripting/zscript/zcc_compile.cpp
@@ -1356,7 +1356,7 @@ bool ZCCCompiler::CompileFields(PContainerType *type, TArray<ZCC_VarDeclarator *
 							{
 								f->mVersion = field->Version;
 							}
-							if (name->Name == Name_globalfreeze)	// Give the parser a kick in the butt for not parsing the declaration properly. I have no idea why it doesn't work.
+							if (name->Name == NAME_globalfreeze)	// Give the parser a kick in the butt for not parsing the declaration properly. I have no idea why it doesn't work.
 							{
 								f->mVersion = MakeVersion(3, 8, 0);
 								f->Flags |= VARF_Deprecated;