From c1a4158ab00f3b065dbe3e1532a7cfa18fdd57fd Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sat, 12 Jan 2019 18:29:31 +0200 Subject: [PATCH] - 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'? --- src/scripting/decorate/thingdef_parse.cpp | 4 ++-- src/scripting/zscript/zcc_compile.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/scripting/decorate/thingdef_parse.cpp b/src/scripting/decorate/thingdef_parse.cpp index d3d63355162..24360b165c8 100644 --- 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); } -} \ No newline at end of file +} diff --git a/src/scripting/zscript/zcc_compile.cpp b/src/scripting/zscript/zcc_compile.cpp index f73ba789a63..3f5208c6ddb 100644 --- a/src/scripting/zscript/zcc_compile.cpp +++ b/src/scripting/zscript/zcc_compile.cpp @@ -1356,7 +1356,7 @@ bool ZCCCompiler::CompileFields(PContainerType *type, TArraymVersion = 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;