zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- do not delete duplicate PFields - they are better be destroyed and left to the GC. 

- removed two duplicate entries to the flag table.
This commit is contained in:
Christoph Oelckers 2016-11-04 15:21:45 +01:00
parent 407345668a
commit 8ae7aae14a
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dobjtype.cpp
View File

@ -2254,7 +2254,7 @@ PField *PStruct::AddNativeField(FName name, PType *type, size_t address, DWORD f
if (Symbols.AddSymbol(field) == nullptr) if (Symbols.AddSymbol(field) == nullptr)
{ // name is already in use { // name is already in use
delete field; field->Destroy();
return nullptr; return nullptr;
} }
Fields.Push(field); Fields.Push(field);

2
src/scripting/thingdef_data.cpp
View File

@ -68,14 +68,12 @@ FFlagDef InternalActorFlagDefs[]=
DEFINE_FLAG(MF, UNMORPHED, AActor, flags), DEFINE_FLAG(MF, UNMORPHED, AActor, flags),
DEFINE_FLAG(MF2, FLY, AActor, flags2), DEFINE_FLAG(MF2, FLY, AActor, flags2),
DEFINE_FLAG(MF2, ONMOBJ, AActor, flags2), DEFINE_FLAG(MF2, ONMOBJ, AActor, flags2),
DEFINE_FLAG(MF2, DONTTRANSLATE, AActor, flags2),
DEFINE_FLAG(MF2, ARGSDEFINED, AActor, flags2), DEFINE_FLAG(MF2, ARGSDEFINED, AActor, flags2),
DEFINE_FLAG(MF3, NOSIGHTCHECK, AActor, flags3), DEFINE_FLAG(MF3, NOSIGHTCHECK, AActor, flags3),
DEFINE_FLAG(MF3, CRASHED, AActor, flags3), DEFINE_FLAG(MF3, CRASHED, AActor, flags3),
DEFINE_FLAG(MF3, WARNBOT, AActor, flags3), DEFINE_FLAG(MF3, WARNBOT, AActor, flags3),
DEFINE_FLAG(MF3, HUNTPLAYERS, AActor, flags3), DEFINE_FLAG(MF3, HUNTPLAYERS, AActor, flags3),
DEFINE_FLAG(MF4, NOHATEPLAYERS, AActor, flags4), DEFINE_FLAG(MF4, NOHATEPLAYERS, AActor, flags4),
DEFINE_FLAG(MF4, NOSKIN, AActor, flags4),
DEFINE_FLAG(MF4, SCROLLMOVE, AActor, flags4), DEFINE_FLAG(MF4, SCROLLMOVE, AActor, flags4),
DEFINE_FLAG(MF4, VFRICTION, AActor, flags4), DEFINE_FLAG(MF4, VFRICTION, AActor, flags4),
DEFINE_FLAG(MF4, BOSSSPAWNED, AActor, flags4), DEFINE_FLAG(MF4, BOSSSPAWNED, AActor, flags4),