zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-29 15:22:08 +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'?
This commit is contained in:
alexey.lysiuk 2019-01-12 18:29:31 +02:00
parent ed14951558
commit c1a4158ab0
2 changed files with 3 additions and 3 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) if (type == nullptr)
{ {
FString newname = typeName.GetChars(); FString newname = typeName.GetChars();
FString sourcefile = sc.FileName; FString sourcefile = sc.FileName.GetChars();
sourcefile.Substitute(":", "@"); sourcefile.Substitute(":", "@");
newname << '@' << sourcefile; newname << '@' << sourcefile;
@ -1342,4 +1342,4 @@ void ParseAllDecorate()
auto ns = Namespaces.NewNamespace(sc.LumpNum); auto ns = Namespaces.NewNamespace(sc.LumpNum);
ParseDecorate(sc, ns); ParseDecorate(sc, ns);
} }
} }

2
src/scripting/zscript/zcc_compile.cpp
View file

@ -1356,7 +1356,7 @@ bool ZCCCompiler::CompileFields(PContainerType *type, TArray<ZCC_VarDeclarator *
{ {
f->mVersion = field->Version; 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->mVersion = MakeVersion(3, 8, 0);
f->Flags |= VARF_Deprecated; f->Flags |= VARF_Deprecated;