From 8ae7aae14ae88396d1806a7243da60f3b5553005 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 4 Nov 2016 15:21:45 +0100 Subject: [PATCH] - do not delete duplicate PFields - they are better be destroyed and left to the GC. - removed two duplicate entries to the flag table. --- src/dobjtype.cpp | 2 +- src/scripting/thingdef_data.cpp | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/dobjtype.cpp b/src/dobjtype.cpp index 631a7e6ee..f1726adbf 100644 --- a/src/dobjtype.cpp +++ b/src/dobjtype.cpp @@ -2254,7 +2254,7 @@ PField *PStruct::AddNativeField(FName name, PType *type, size_t address, DWORD f if (Symbols.AddSymbol(field) == nullptr) { // name is already in use - delete field; + field->Destroy(); return nullptr; } Fields.Push(field); diff --git a/src/scripting/thingdef_data.cpp b/src/scripting/thingdef_data.cpp index f628dec3c..74c685ea8 100644 --- a/src/scripting/thingdef_data.cpp +++ b/src/scripting/thingdef_data.cpp @@ -68,14 +68,12 @@ FFlagDef InternalActorFlagDefs[]= DEFINE_FLAG(MF, UNMORPHED, AActor, flags), DEFINE_FLAG(MF2, FLY, AActor, flags2), DEFINE_FLAG(MF2, ONMOBJ, AActor, flags2), - DEFINE_FLAG(MF2, DONTTRANSLATE, AActor, flags2), DEFINE_FLAG(MF2, ARGSDEFINED, AActor, flags2), DEFINE_FLAG(MF3, NOSIGHTCHECK, AActor, flags3), DEFINE_FLAG(MF3, CRASHED, AActor, flags3), DEFINE_FLAG(MF3, WARNBOT, AActor, flags3), DEFINE_FLAG(MF3, HUNTPLAYERS, AActor, flags3), DEFINE_FLAG(MF4, NOHATEPLAYERS, AActor, flags4), - DEFINE_FLAG(MF4, NOSKIN, AActor, flags4), DEFINE_FLAG(MF4, SCROLLMOVE, AActor, flags4), DEFINE_FLAG(MF4, VFRICTION, AActor, flags4), DEFINE_FLAG(MF4, BOSSSPAWNED, AActor, flags4),