zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-23 04:22:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed compilation errors

Browse source 
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
This commit is contained in:
alexey.lysiuk 2019-01-12 18:29:31 +02:00 committed by Christoph Oelckers
parent 7c3ec662e1
commit 141d5bdf3e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/scripting/decorate/thingdef_parse.cpp
View file

@ -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);
}
}
}