From 141d5bdf3eee0c89b7255a1c02c67692961e97cb 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'? # Conflicts: # src/scripting/zscript/zcc_compile.cpp --- src/scripting/decorate/thingdef_parse.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scripting/decorate/thingdef_parse.cpp b/src/scripting/decorate/thingdef_parse.cpp index d3d633551..24360b165 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 +}