diff --git a/src/b_bot.cpp b/src/b_bot.cpp
index 42b34f1df7..93d71092d7 100644
--- a/src/b_bot.cpp
+++ b/src/b_bot.cpp
@@ -15,7 +15,7 @@
 #include "serializer.h"
 #include "d_player.h"
 
-IMPLEMENT_CLASS(DBot, false, true, false)
+IMPLEMENT_CLASS(DBot, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DBot)
 	IMPLEMENT_POINTER(dest)
diff --git a/src/c_dispatch.cpp b/src/c_dispatch.cpp
index e7ccc89228..71aeea0faa 100644
--- a/src/c_dispatch.cpp
+++ b/src/c_dispatch.cpp
@@ -187,7 +187,7 @@ static const char *KeyConfCommands[] =
 
 // CODE --------------------------------------------------------------------
 
-IMPLEMENT_CLASS(DWaitingCommand, false, false, false)
+IMPLEMENT_CLASS(DWaitingCommand, false, false, false, false)
 
 void DWaitingCommand::Serialize(FSerializer &arc)
 {
@@ -225,7 +225,7 @@ void DWaitingCommand::Tick ()
 	}
 }
 
-IMPLEMENT_CLASS(DStoredCommand, false, false, false)
+IMPLEMENT_CLASS(DStoredCommand, false, false, false, false)
 
 DStoredCommand::DStoredCommand ()
 {
diff --git a/src/d_dehacked.cpp b/src/d_dehacked.cpp
index afaf7001b5..8258a656ea 100644
--- a/src/d_dehacked.cpp
+++ b/src/d_dehacked.cpp
@@ -231,7 +231,7 @@ DehInfo deh =
 // from the original actor's defaults. The original actor is then changed to
 // spawn the new class.
 
-IMPLEMENT_CLASS(ADehackedPickup, false, true, false)
+IMPLEMENT_CLASS(ADehackedPickup, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(ADehackedPickup)
 	IMPLEMENT_POINTER(RealPickup)
diff --git a/src/decallib.cpp b/src/decallib.cpp
index 6264970628..970bd7458c 100644
--- a/src/decallib.cpp
+++ b/src/decallib.cpp
@@ -119,7 +119,7 @@ protected:
 	DDecalThinker () : DThinker (STAT_DECALTHINKER) {}
 };
 
-IMPLEMENT_CLASS(DDecalThinker, false, true, false)
+IMPLEMENT_CLASS(DDecalThinker, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DDecalThinker)
 	IMPLEMENT_POINTER(TheDecal)
@@ -1153,7 +1153,7 @@ FDecalAnimator::~FDecalAnimator ()
 {
 }
 
-IMPLEMENT_CLASS(DDecalFader, false, false, false)
+IMPLEMENT_CLASS(DDecalFader, false, false, false, false)
 
 void DDecalFader::Serialize(FSerializer &arc)
 {
@@ -1202,7 +1202,7 @@ DThinker *FDecalFaderAnim::CreateThinker (DBaseDecal *actor, side_t *wall) const
 	return fader;
 }
 
-IMPLEMENT_CLASS(DDecalStretcher, false, false, false)
+IMPLEMENT_CLASS(DDecalStretcher, false, false, false, false)
 
 void DDecalStretcher::Serialize(FSerializer &arc)
 {
@@ -1290,7 +1290,7 @@ void DDecalStretcher::Tick ()
 	}
 }
 
-IMPLEMENT_CLASS(DDecalSlider, false, false, false)
+IMPLEMENT_CLASS(DDecalSlider, false, false, false, false)
 
 void DDecalSlider::Serialize(FSerializer &arc)
 {
@@ -1370,7 +1370,7 @@ FDecalAnimator *FDecalLib::FindAnimator (const char *name)
 	return NULL;
 }
 
-IMPLEMENT_CLASS(DDecalColorer, false, false, false)
+IMPLEMENT_CLASS(DDecalColorer, false, false, false, false)
 
 void DDecalColorer::Serialize(FSerializer &arc)
 {
diff --git a/src/dobjgc.cpp b/src/dobjgc.cpp
index fa59392d57..fa8723e902 100644
--- a/src/dobjgc.cpp
+++ b/src/dobjgc.cpp
@@ -126,7 +126,7 @@ public:
 	int SideNum;
 };
 
-IMPLEMENT_CLASS(DSectorMarker, false, false, false)
+IMPLEMENT_CLASS(DSectorMarker, false, false, false, false)
 
 // EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
 
diff --git a/src/dobjtype.cpp b/src/dobjtype.cpp
index 89b9986cc2..71bfd542bd 100644
--- a/src/dobjtype.cpp
+++ b/src/dobjtype.cpp
@@ -93,8 +93,8 @@ static const size_t TheEnd = ~(size_t)0;
 
 // CODE --------------------------------------------------------------------
 
-IMPLEMENT_CLASS(PErrorType, false, false, false)
-IMPLEMENT_CLASS(PVoidType, false, false, false)
+IMPLEMENT_CLASS(PErrorType, false, false, false, false)
+IMPLEMENT_CLASS(PVoidType, false, false, false, false)
 
 void DumpTypeTable()
 {
@@ -141,7 +141,7 @@ void DumpTypeTable()
 
 /* PClassType *************************************************************/
 
-IMPLEMENT_CLASS(PClassType, false, false, false)
+IMPLEMENT_CLASS(PClassType, false, false, false, false)
 
 //==========================================================================
 //
@@ -169,7 +169,7 @@ void PClassType::Derive(PClass *newclass)
 
 /* PClassClass ************************************************************/
 
-IMPLEMENT_CLASS(PClassClass, false, false, false)
+IMPLEMENT_CLASS(PClassClass, false, false, false, false)
 
 //==========================================================================
 //
@@ -187,7 +187,7 @@ PClassClass::PClassClass()
 
 /* PType ******************************************************************/
 
-IMPLEMENT_CLASS(PType, true, true, false)
+IMPLEMENT_CLASS(PType, true, true, false, false)
 
 IMPLEMENT_POINTERS_START(PType)
 	IMPLEMENT_POINTER(HashNext)
@@ -614,7 +614,7 @@ void PType::StaticInit()
 
 /* PBasicType *************************************************************/
 
-IMPLEMENT_CLASS(PBasicType, true, false, false)
+IMPLEMENT_CLASS(PBasicType, true, false, false, false)
 
 //==========================================================================
 //
@@ -640,11 +640,11 @@ PBasicType::PBasicType(unsigned int size, unsigned int align)
 
 /* PCompoundType **********************************************************/
 
-IMPLEMENT_CLASS(PCompoundType, true, false, false)
+IMPLEMENT_CLASS(PCompoundType, true, false, false, false)
 
 /* PNamedType *************************************************************/
 
-IMPLEMENT_CLASS(PNamedType, true, true, false)
+IMPLEMENT_CLASS(PNamedType, true, true, false, false)
 
 IMPLEMENT_POINTERS_START(PNamedType)
 	IMPLEMENT_POINTER(Outer)
@@ -692,7 +692,7 @@ FString PNamedType::QualifiedName() const
 
 /* PInt *******************************************************************/
 
-IMPLEMENT_CLASS(PInt, false, false, false)
+IMPLEMENT_CLASS(PInt, false, false, false, false)
 
 //==========================================================================
 //
@@ -931,7 +931,7 @@ double PInt::GetValueFloat(void *addr) const
 
 /* PBool ******************************************************************/
 
-IMPLEMENT_CLASS(PBool, false, false, false)
+IMPLEMENT_CLASS(PBool, false, false, false, false)
 
 //==========================================================================
 //
@@ -952,7 +952,7 @@ PBool::PBool()
 
 /* PFloat *****************************************************************/
 
-IMPLEMENT_CLASS(PFloat, false, false, false)
+IMPLEMENT_CLASS(PFloat, false, false, false, false)
 
 //==========================================================================
 //
@@ -1202,7 +1202,7 @@ void PFloat::SetOps()
 
 /* PString ****************************************************************/
 
-IMPLEMENT_CLASS(PString, false, false, false)
+IMPLEMENT_CLASS(PString, false, false, false, false)
 
 //==========================================================================
 //
@@ -1299,7 +1299,7 @@ void PString::DestroyValue(void *addr) const
 
 /* PName ******************************************************************/
 
-IMPLEMENT_CLASS(PName, false, false, false)
+IMPLEMENT_CLASS(PName, false, false, false, false)
 
 //==========================================================================
 //
@@ -1349,7 +1349,7 @@ bool PName::ReadValue(FSerializer &ar, const char *key, void *addr) const
 
 /* PSound *****************************************************************/
 
-IMPLEMENT_CLASS(PSound, false, false, false)
+IMPLEMENT_CLASS(PSound, false, false, false, false)
 
 //==========================================================================
 //
@@ -1399,7 +1399,7 @@ bool PSound::ReadValue(FSerializer &ar, const char *key, void *addr) const
 
 /* PColor *****************************************************************/
 
-IMPLEMENT_CLASS(PColor, false, false, false)
+IMPLEMENT_CLASS(PColor, false, false, false, false)
 
 //==========================================================================
 //
@@ -1416,7 +1416,7 @@ PColor::PColor()
 
 /* PStatePointer **********************************************************/
 
-IMPLEMENT_CLASS(PStatePointer, false, false, false)
+IMPLEMENT_CLASS(PStatePointer, false, false, false, false)
 
 //==========================================================================
 //
@@ -1460,7 +1460,7 @@ bool PStatePointer::ReadValue(FSerializer &ar, const char *key, void *addr) cons
 
 /* PPointer ***************************************************************/
 
-IMPLEMENT_CLASS(PPointer, false, true, false)
+IMPLEMENT_CLASS(PPointer, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(PPointer)
 	IMPLEMENT_POINTER(PointedType)
@@ -1591,7 +1591,7 @@ PPointer *NewPointer(PType *type, bool isconst)
 
 /* PClassPointer **********************************************************/
 
-IMPLEMENT_CLASS(PClassPointer, false, true, false)
+IMPLEMENT_CLASS(PClassPointer, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(PClassPointer)
 	IMPLEMENT_POINTER(ClassRestriction)
@@ -1672,7 +1672,7 @@ PClassPointer *NewClassPointer(PClass *restrict)
 
 /* PEnum ******************************************************************/
 
-IMPLEMENT_CLASS(PEnum, false, true, false)
+IMPLEMENT_CLASS(PEnum, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(PEnum)
 	IMPLEMENT_POINTER(ValueType)
@@ -1725,7 +1725,7 @@ PEnum *NewEnum(FName name, PTypeBase *outer)
 
 /* PArray *****************************************************************/
 
-IMPLEMENT_CLASS(PArray, false, true, false)
+IMPLEMENT_CLASS(PArray, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(PArray)
 	IMPLEMENT_POINTER(ElementType)
@@ -1874,7 +1874,7 @@ PArray *NewArray(PType *type, unsigned int count)
 
 /* PVector ****************************************************************/
 
-IMPLEMENT_CLASS(PVector, false, false, false)
+IMPLEMENT_CLASS(PVector, false, false, false, false)
 
 //==========================================================================
 //
@@ -1924,7 +1924,7 @@ PVector *NewVector(unsigned int size)
 
 /* PDynArray **************************************************************/
 
-IMPLEMENT_CLASS(PDynArray, false, true, false)
+IMPLEMENT_CLASS(PDynArray, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(PDynArray)
 	IMPLEMENT_POINTER(ElementType)
@@ -2007,7 +2007,7 @@ PDynArray *NewDynArray(PType *type)
 
 /* PMap *******************************************************************/
 
-IMPLEMENT_CLASS(PMap, false, true, false)
+IMPLEMENT_CLASS(PMap, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(PMap)
 	IMPLEMENT_POINTER(KeyType)
@@ -2091,7 +2091,7 @@ PMap *NewMap(PType *keytype, PType *valuetype)
 
 /* PStruct ****************************************************************/
 
-IMPLEMENT_CLASS(PStruct, false, false, false)
+IMPLEMENT_CLASS(PStruct, false, false, false, false)
 
 //==========================================================================
 //
@@ -2312,7 +2312,7 @@ PStruct *NewStruct(FName name, PTypeBase *outer)
 
 /* PField *****************************************************************/
 
-IMPLEMENT_CLASS(PField, false, false, false)
+IMPLEMENT_CLASS(PField, false, false, false, false)
 
 //==========================================================================
 //
@@ -2357,7 +2357,7 @@ PField::PField(FName name, PType *type, DWORD flags, size_t offset, int bitvalue
 
 /* PPrototype *************************************************************/
 
-IMPLEMENT_CLASS(PPrototype, false, false, false)
+IMPLEMENT_CLASS(PPrototype, false, false, false, false)
 
 //==========================================================================
 //
@@ -2443,7 +2443,7 @@ PPrototype *NewPrototype(const TArray<PType *> &rettypes, const TArray<PType *>
 
 /* PFunction **************************************************************/
 
-IMPLEMENT_CLASS(PFunction, false, false, false)
+IMPLEMENT_CLASS(PFunction, false, false, false, false)
 
 //==========================================================================
 //
@@ -2501,7 +2501,7 @@ unsigned PFunction::AddVariant(PPrototype *proto, TArray<DWORD> &argflags, TArra
 
 /* PClass *****************************************************************/
 
-IMPLEMENT_CLASS(PClass, false, true, false)
+IMPLEMENT_CLASS(PClass, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(PClass)
 	IMPLEMENT_POINTER(ParentClass)
@@ -3424,19 +3424,19 @@ CCMD(typetable)
 
 // Symbol tables ------------------------------------------------------------
 
-IMPLEMENT_CLASS(PTypeBase, true, false, false);
-IMPLEMENT_CLASS(PSymbol, true, false, false);
-IMPLEMENT_CLASS(PSymbolConst, false, false, false);
-IMPLEMENT_CLASS(PSymbolConstNumeric, false, false, false);
-IMPLEMENT_CLASS(PSymbolConstString, false, false, false);
-IMPLEMENT_CLASS(PSymbolTreeNode, false, false, false)
-IMPLEMENT_CLASS(PSymbolType, false, true, false)
+IMPLEMENT_CLASS(PTypeBase, true, false, false, false);
+IMPLEMENT_CLASS(PSymbol, true, false, false, false);
+IMPLEMENT_CLASS(PSymbolConst, false, false, false, false);
+IMPLEMENT_CLASS(PSymbolConstNumeric, false, false, false, false);
+IMPLEMENT_CLASS(PSymbolConstString, false, false, false, false);
+IMPLEMENT_CLASS(PSymbolTreeNode, false, false, false, false)
+IMPLEMENT_CLASS(PSymbolType, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(PSymbolType)
 	IMPLEMENT_POINTER(Type)
 IMPLEMENT_POINTERS_END
 
-IMPLEMENT_CLASS(PSymbolVMFunction, false, true, false)
+IMPLEMENT_CLASS(PSymbolVMFunction, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(PSymbolVMFunction)
 	IMPLEMENT_POINTER(Function)
diff --git a/src/dsectoreffect.cpp b/src/dsectoreffect.cpp
index e07f9eace4..700a407fd7 100644
--- a/src/dsectoreffect.cpp
+++ b/src/dsectoreffect.cpp
@@ -31,7 +31,7 @@
 #include "serializer.h"
 #include "doomstat.h"
 
-IMPLEMENT_CLASS(DSectorEffect, false, false, false)
+IMPLEMENT_CLASS(DSectorEffect, false, false, false, false)
 
 DSectorEffect::DSectorEffect ()
 : DThinker(STAT_SECTOREFFECT)
@@ -71,7 +71,7 @@ void DSectorEffect::Serialize(FSerializer &arc)
 	arc("sector", m_Sector);
 }
 
-IMPLEMENT_CLASS(DMover, false, true, false)
+IMPLEMENT_CLASS(DMover, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DMover)
 	IMPLEMENT_POINTER(interpolation)
@@ -108,7 +108,7 @@ void DMover::StopInterpolation(bool force)
 	}
 }
 
-IMPLEMENT_CLASS(DMovingFloor, false, false, false)
+IMPLEMENT_CLASS(DMovingFloor, false, false, false, false)
 
 DMovingFloor::DMovingFloor ()
 {
@@ -121,7 +121,7 @@ DMovingFloor::DMovingFloor (sector_t *sector)
 	interpolation = sector->SetInterpolation(sector_t::FloorMove, true);
 }
 
-IMPLEMENT_CLASS(DMovingCeiling, false, false, false)
+IMPLEMENT_CLASS(DMovingCeiling, false, false, false, false)
 
 DMovingCeiling::DMovingCeiling ()
 {
diff --git a/src/dthinker.cpp b/src/dthinker.cpp
index 246b9ed2c1..9c87c46b45 100644
--- a/src/dthinker.cpp
+++ b/src/dthinker.cpp
@@ -47,7 +47,7 @@ extern cycle_t BotSupportCycles;
 extern cycle_t ActionCycles;
 extern int BotWTG;
 
-IMPLEMENT_CLASS(DThinker, false, false, false)
+IMPLEMENT_CLASS(DThinker, false, false, false, false)
 
 DThinker *NextToThink;
 
@@ -538,7 +538,7 @@ public:
 	}
 };
 
-IMPLEMENT_CLASS(DThinkerIterator, false, false, false);
+IMPLEMENT_CLASS(DThinkerIterator, false, false, false, false);
 DEFINE_ACTION_FUNCTION(DThinkerIterator, Create)
 {
 	PARAM_PROLOGUE;
diff --git a/src/fragglescript/t_func.cpp b/src/fragglescript/t_func.cpp
index 737376ecbb..ddc1a4bd42 100644
--- a/src/fragglescript/t_func.cpp
+++ b/src/fragglescript/t_func.cpp
@@ -1785,7 +1785,7 @@ public:
 	void		Destroy() { Super::Destroy(); m_Sector->lightingdata=NULL; }
 };
 
-IMPLEMENT_CLASS(DLightLevel, false, false, false)
+IMPLEMENT_CLASS(DLightLevel, false, false, false, false)
 
 void DLightLevel::Serialize(FSerializer &arc)
 {
diff --git a/src/fragglescript/t_prepro.cpp b/src/fragglescript/t_prepro.cpp
index 0a3ec6a0de..2129df54f7 100644
--- a/src/fragglescript/t_prepro.cpp
+++ b/src/fragglescript/t_prepro.cpp
@@ -71,7 +71,7 @@
 //
 //==========================================================================
 
-IMPLEMENT_CLASS(DFsSection, false, true, false)
+IMPLEMENT_CLASS(DFsSection, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DFsSection)
 	IMPLEMENT_POINTER(next)
diff --git a/src/fragglescript/t_script.cpp b/src/fragglescript/t_script.cpp
index 326cad621f..a401226236 100644
--- a/src/fragglescript/t_script.cpp
+++ b/src/fragglescript/t_script.cpp
@@ -99,7 +99,7 @@ AActor *trigger_obj;
 //
 //==========================================================================
 
-IMPLEMENT_CLASS(DFsScript, false, true, false)
+IMPLEMENT_CLASS(DFsScript, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DFsScript)
 	IMPLEMENT_POINTER(parent)
@@ -269,7 +269,7 @@ void DFsScript::ParseScript(char *position)
 //
 //==========================================================================
 
-IMPLEMENT_CLASS(DRunningScript, false, true, false)
+IMPLEMENT_CLASS(DRunningScript, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DRunningScript)
 	IMPLEMENT_POINTER(prev)
@@ -380,7 +380,7 @@ void DRunningScript::Serialize(FSerializer &arc)
 //
 //==========================================================================
 
-IMPLEMENT_CLASS(DFraggleThinker, false, true, false)
+IMPLEMENT_CLASS(DFraggleThinker, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DFraggleThinker)
 	IMPLEMENT_POINTER(RunningScripts)
diff --git a/src/fragglescript/t_variable.cpp b/src/fragglescript/t_variable.cpp
index cebf0160c3..23d24b78a7 100644
--- a/src/fragglescript/t_variable.cpp
+++ b/src/fragglescript/t_variable.cpp
@@ -179,7 +179,7 @@ AActor* actorvalue(const svalue_t &svalue)
 //
 //==========================================================================
 
-IMPLEMENT_CLASS(DFsVariable, false, true, false)
+IMPLEMENT_CLASS(DFsVariable, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DFsVariable)
 	IMPLEMENT_POINTER(next)
diff --git a/src/g_doom/a_scriptedmarine.cpp b/src/g_doom/a_scriptedmarine.cpp
index 1342713955..da2c7f7910 100644
--- a/src/g_doom/a_scriptedmarine.cpp
+++ b/src/g_doom/a_scriptedmarine.cpp
@@ -19,7 +19,7 @@ static FRandom pr_m_gunshot ("SMarineGunshot");
 static FRandom pr_m_saw ("SMarineSaw");
 static FRandom pr_m_fireshotgun2 ("SMarineFireSSG");
 
-IMPLEMENT_CLASS(AScriptedMarine, false, false, false)
+IMPLEMENT_CLASS(AScriptedMarine, false, false, false, false)
 
 void AScriptedMarine::Serialize(FSerializer &arc)
 {
diff --git a/src/g_heretic/a_chicken.cpp b/src/g_heretic/a_chicken.cpp
index 762d105945..fa26f73158 100644
--- a/src/g_heretic/a_chicken.cpp
+++ b/src/g_heretic/a_chicken.cpp
@@ -29,7 +29,7 @@ public:
 	void MorphPlayerThink ();
 };
 
-IMPLEMENT_CLASS(AChickenPlayer, false, false, false)
+IMPLEMENT_CLASS(AChickenPlayer, false, false, false, false)
 
 void AChickenPlayer::MorphPlayerThink ()
 {
diff --git a/src/g_heretic/a_hereticartifacts.cpp b/src/g_heretic/a_hereticartifacts.cpp
index 9078d09405..169d0e7714 100644
--- a/src/g_heretic/a_hereticartifacts.cpp
+++ b/src/g_heretic/a_hereticartifacts.cpp
@@ -17,7 +17,7 @@ public:
 	bool Use (bool pickup);
 };
 
-IMPLEMENT_CLASS(AArtiTomeOfPower, false, false, false)
+IMPLEMENT_CLASS(AArtiTomeOfPower, false, false, false, false)
 
 bool AArtiTomeOfPower::Use (bool pickup)
 {
@@ -63,7 +63,7 @@ public:
 	bool Use (bool pickup);
 };
 
-IMPLEMENT_CLASS(AArtiTimeBomb, false, false, false)
+IMPLEMENT_CLASS(AArtiTimeBomb, false, false, false, false)
 
 bool AArtiTimeBomb::Use (bool pickup)
 {
diff --git a/src/g_heretic/a_hereticweaps.cpp b/src/g_heretic/a_hereticweaps.cpp
index b32056374f..38991b87db 100644
--- a/src/g_heretic/a_hereticweaps.cpp
+++ b/src/g_heretic/a_hereticweaps.cpp
@@ -358,7 +358,7 @@ public:
 	int DoSpecialDamage (AActor *target, int damage, FName damagetype);
 };
 
-IMPLEMENT_CLASS(AMaceFX4, false, false, false)
+IMPLEMENT_CLASS(AMaceFX4, false, false, false, false)
 
 int AMaceFX4::DoSpecialDamage (AActor *target, int damage, FName damagetype)
 {
@@ -726,7 +726,7 @@ void ABlasterFX1::Effect ()
 	}
 }
 
-IMPLEMENT_CLASS(ABlasterFX1, false, false, false)
+IMPLEMENT_CLASS(ABlasterFX1, false, false, false, false)
 
 // Ripper -------------------------------------------------------------------
 
@@ -738,7 +738,7 @@ public:
 	int DoSpecialDamage (AActor *target, int damage, FName damagetype);
 };
 
-IMPLEMENT_CLASS(ARipper, false, false, false)
+IMPLEMENT_CLASS(ARipper, false, false, false, false)
 
 int ARipper::DoSpecialDamage (AActor *target, int damage, FName damagetype)
 {
@@ -828,7 +828,7 @@ public:
 	int DoSpecialDamage (AActor *target, int damage, FName damagetype);
 };
 
-IMPLEMENT_CLASS(AHornRodFX2, false, false, false)
+IMPLEMENT_CLASS(AHornRodFX2, false, false, false, false)
 
 int AHornRodFX2::DoSpecialDamage (AActor *target, int damage, FName damagetype)
 {
@@ -849,7 +849,7 @@ public:
 	int DoSpecialDamage (AActor *target, int damage, FName damagetype);
 };
 
-IMPLEMENT_CLASS(ARainPillar, false, false, false)
+IMPLEMENT_CLASS(ARainPillar, false, false, false, false)
 
 int ARainPillar::DoSpecialDamage (AActor *target, int damage, FName damagetype)
 {
@@ -871,7 +871,7 @@ public:
 	TObjPtr<AActor> Rain1, Rain2;
 };
 
-IMPLEMENT_CLASS(ARainTracker, false, false, false)
+IMPLEMENT_CLASS(ARainTracker, false, false, false, false)
 	
 void ARainTracker::Serialize(FSerializer &arc)
 {
@@ -1158,8 +1158,8 @@ public:
 	void EndPowerup ();
 };
 
-IMPLEMENT_CLASS(APhoenixRod, false, false, false)
-IMPLEMENT_CLASS(APhoenixRodPowered, false, false, false)
+IMPLEMENT_CLASS(APhoenixRod, false, false, false, false)
+IMPLEMENT_CLASS(APhoenixRodPowered, false, false, false, false)
 
 void APhoenixRodPowered::EndPowerup ()
 {
@@ -1177,7 +1177,7 @@ public:
 	int DoSpecialDamage (AActor *target, int damage, FName damagetype);
 };
 
-IMPLEMENT_CLASS(APhoenixFX1, false, false, false)
+IMPLEMENT_CLASS(APhoenixFX1, false, false, false, false)
 
 int APhoenixFX1::DoSpecialDamage (AActor *target, int damage, FName damagetype)
 {
@@ -1198,7 +1198,7 @@ public:
 	int DoSpecialDamage (AActor *target, int damage, FName damagetype);
 };
 
-IMPLEMENT_CLASS(APhoenixFX2, false, false, false)
+IMPLEMENT_CLASS(APhoenixFX2, false, false, false, false)
 
 int APhoenixFX2::DoSpecialDamage (AActor *target, int damage, FName damagetype)
 {
diff --git a/src/g_heretic/a_ironlich.cpp b/src/g_heretic/a_ironlich.cpp
index 3870219d9b..8068c251bc 100644
--- a/src/g_heretic/a_ironlich.cpp
+++ b/src/g_heretic/a_ironlich.cpp
@@ -22,7 +22,7 @@ public:
 	int DoSpecialDamage (AActor *target, int damage, FName damagetype);
 };
 
-IMPLEMENT_CLASS(AWhirlwind, false, false, false)
+IMPLEMENT_CLASS(AWhirlwind, false, false, false, false)
 
 int AWhirlwind::DoSpecialDamage (AActor *target, int damage, FName damagetype)
 {
diff --git a/src/g_hexen/a_boostarmor.cpp b/src/g_hexen/a_boostarmor.cpp
index 77fbf3dbd4..1323af8a53 100644
--- a/src/g_hexen/a_boostarmor.cpp
+++ b/src/g_hexen/a_boostarmor.cpp
@@ -17,7 +17,7 @@ public:
 	bool Use (bool pickup);
 };
 
-IMPLEMENT_CLASS(AArtiBoostArmor, false, false, false)
+IMPLEMENT_CLASS(AArtiBoostArmor, false, false, false, false)
 
 bool AArtiBoostArmor::Use (bool pickup)
 {
diff --git a/src/g_hexen/a_clericflame.cpp b/src/g_hexen/a_clericflame.cpp
index c0c6cb3ede..f0e9c16b24 100644
--- a/src/g_hexen/a_clericflame.cpp
+++ b/src/g_hexen/a_clericflame.cpp
@@ -33,7 +33,7 @@ public:
 	void Effect ();
 };
 
-IMPLEMENT_CLASS(ACFlameMissile, false, false, false)
+IMPLEMENT_CLASS(ACFlameMissile, false, false, false, false)
 
 void ACFlameMissile::BeginPlay ()
 {
diff --git a/src/g_hexen/a_clericholy.cpp b/src/g_hexen/a_clericholy.cpp
index 931c75e893..d09c3f6aa7 100644
--- a/src/g_hexen/a_clericholy.cpp
+++ b/src/g_hexen/a_clericholy.cpp
@@ -58,11 +58,11 @@ public:
 	BYTE CHolyCount;
 };
 
-IMPLEMENT_CLASS(ACWeapWraithverge, false, false, false)
+IMPLEMENT_CLASS(ACWeapWraithverge, false, false, false, false)
 
 // Holy Spirit --------------------------------------------------------------
 
-IMPLEMENT_CLASS(AHolySpirit, false, false, false)
+IMPLEMENT_CLASS(AHolySpirit, false, false, false, false)
 
 bool AHolySpirit::Slam(AActor *thing)
 {
diff --git a/src/g_hexen/a_clericstaff.cpp b/src/g_hexen/a_clericstaff.cpp
index 940a878844..a4050a1efb 100644
--- a/src/g_hexen/a_clericstaff.cpp
+++ b/src/g_hexen/a_clericstaff.cpp
@@ -25,7 +25,7 @@ public:
 	int DoSpecialDamage (AActor *target, int damage, FName damagetype);
 };
 
-IMPLEMENT_CLASS(ACStaffMissile, false, false, false)
+IMPLEMENT_CLASS(ACStaffMissile, false, false, false, false)
 
 int ACStaffMissile::DoSpecialDamage (AActor *target, int damage, FName damagetype)
 {
diff --git a/src/g_hexen/a_fighteraxe.cpp b/src/g_hexen/a_fighteraxe.cpp
index 89e3170120..4260f4eb41 100644
--- a/src/g_hexen/a_fighteraxe.cpp
+++ b/src/g_hexen/a_fighteraxe.cpp
@@ -38,7 +38,7 @@ public:
 	FState *GetAtkState (bool hold);
 };
 
-IMPLEMENT_CLASS(AFWeapAxe, false, false, false)
+IMPLEMENT_CLASS(AFWeapAxe, false, false, false, false)
 
 FState *AFWeapAxe::GetUpState ()
 {
diff --git a/src/g_hexen/a_fighterplayer.cpp b/src/g_hexen/a_fighterplayer.cpp
index 7e18f9c283..ff4348520a 100644
--- a/src/g_hexen/a_fighterplayer.cpp
+++ b/src/g_hexen/a_fighterplayer.cpp
@@ -11,9 +11,9 @@
 #include "vm.h"
 */
 
-IMPLEMENT_CLASS(AFighterWeapon, false, false, false)
-IMPLEMENT_CLASS(AClericWeapon, false, false, false)
-IMPLEMENT_CLASS(AMageWeapon, false, false, false)
+IMPLEMENT_CLASS(AFighterWeapon, false, false, false, false)
+IMPLEMENT_CLASS(AClericWeapon, false, false, false, false)
+IMPLEMENT_CLASS(AMageWeapon, false, false, false, false)
 
 static FRandom pr_fpatk ("FPunchAttack");
 
diff --git a/src/g_hexen/a_fighterquietus.cpp b/src/g_hexen/a_fighterquietus.cpp
index c000a9fafc..c900794ed0 100644
--- a/src/g_hexen/a_fighterquietus.cpp
+++ b/src/g_hexen/a_fighterquietus.cpp
@@ -59,7 +59,7 @@ public:
 	int DoSpecialDamage(AActor *victim, int damage, FName damagetype);
 };
 
-IMPLEMENT_CLASS(AFSwordMissile, false, false, false)
+IMPLEMENT_CLASS(AFSwordMissile, false, false, false, false)
 
 int AFSwordMissile::DoSpecialDamage(AActor *victim, int damage, FName damagetype)
 {
diff --git a/src/g_hexen/a_flechette.cpp b/src/g_hexen/a_flechette.cpp
index 3da16db9ca..3358428874 100644
--- a/src/g_hexen/a_flechette.cpp
+++ b/src/g_hexen/a_flechette.cpp
@@ -24,7 +24,7 @@ DECLARE_ACTION(A_CheckThrowBomb)
 
 // Poison Bag Artifact (Flechette) ------------------------------------------
 
-IMPLEMENT_CLASS(AArtiPoisonBag, false, false, false)
+IMPLEMENT_CLASS(AArtiPoisonBag, false, false, false, false)
 
 // Poison Bag 1 (The Cleric's) ----------------------------------------------
 
@@ -35,7 +35,7 @@ public:
 	bool Use (bool pickup);
 };
 
-IMPLEMENT_CLASS(AArtiPoisonBag1, false, false, false)
+IMPLEMENT_CLASS(AArtiPoisonBag1, false, false, false, false)
 
 bool AArtiPoisonBag1::Use (bool pickup)
 {
@@ -60,7 +60,7 @@ public:
 	bool Use (bool pickup);
 };
 
-IMPLEMENT_CLASS(AArtiPoisonBag2, false, false, false)
+IMPLEMENT_CLASS(AArtiPoisonBag2, false, false, false, false)
 
 bool AArtiPoisonBag2::Use (bool pickup)
 {
@@ -85,7 +85,7 @@ public:
 	bool Use (bool pickup);
 };
 
-IMPLEMENT_CLASS(AArtiPoisonBag3, false, false, false)
+IMPLEMENT_CLASS(AArtiPoisonBag3, false, false, false, false)
 
 bool AArtiPoisonBag3::Use (bool pickup)
 {
@@ -136,7 +136,7 @@ public:
 	bool Use (bool pickup);
 };
 
-IMPLEMENT_CLASS(AArtiPoisonBagGiver, false, false, false)
+IMPLEMENT_CLASS(AArtiPoisonBagGiver, false, false, false, false)
 
 bool AArtiPoisonBagGiver::Use (bool pickup)
 {
@@ -167,7 +167,7 @@ public:
 	bool Use (bool pickup);
 };
 
-IMPLEMENT_CLASS(AArtiPoisonBagShooter, false, false, false)
+IMPLEMENT_CLASS(AArtiPoisonBagShooter, false, false, false, false)
 
 bool AArtiPoisonBagShooter::Use (bool pickup)
 {
@@ -296,7 +296,7 @@ public:
 	void BeginPlay ();
 };
 
-IMPLEMENT_CLASS(APoisonCloud, false, false, false)
+IMPLEMENT_CLASS(APoisonCloud, false, false, false, false)
 
 void APoisonCloud::BeginPlay ()
 {
diff --git a/src/g_hexen/a_healingradius.cpp b/src/g_hexen/a_healingradius.cpp
index 3d4eef0aea..25efbc3ca4 100644
--- a/src/g_hexen/a_healingradius.cpp
+++ b/src/g_hexen/a_healingradius.cpp
@@ -25,7 +25,7 @@ public:
 	bool Use (bool pickup);
 };
 
-IMPLEMENT_CLASS(AArtiHealingRadius, false, false, false)
+IMPLEMENT_CLASS(AArtiHealingRadius, false, false, false, false)
 
 bool AArtiHealingRadius::Use (bool pickup)
 {
diff --git a/src/g_hexen/a_heresiarch.cpp b/src/g_hexen/a_heresiarch.cpp
index 964fdd44f2..32ad9ab696 100644
--- a/src/g_hexen/a_heresiarch.cpp
+++ b/src/g_hexen/a_heresiarch.cpp
@@ -72,7 +72,7 @@ public:
 	void Die (AActor *source, AActor *inflictor, int dmgflags);
 };
 
-IMPLEMENT_CLASS(AHeresiarch, false, false, false)
+IMPLEMENT_CLASS(AHeresiarch, false, false, false, false)
 
 void AHeresiarch::Serialize(FSerializer &arc)
 {
@@ -122,7 +122,7 @@ public:
 	}
 };
 
-IMPLEMENT_CLASS(ASorcBall, false, false, false)
+IMPLEMENT_CLASS(ASorcBall, false, false, false, false)
 
 // First ball (purple) - fires projectiles ----------------------------------
 
@@ -140,7 +140,7 @@ public:
 	virtual void CastSorcererSpell ();
 };
 
-IMPLEMENT_CLASS(ASorcBall1, false, false, false)
+IMPLEMENT_CLASS(ASorcBall1, false, false, false, false)
 
 // Second ball (blue) - generates the shield --------------------------------
 
@@ -156,7 +156,7 @@ public:
 	virtual void CastSorcererSpell ();
 };
 
-IMPLEMENT_CLASS(ASorcBall2, false, false, false)
+IMPLEMENT_CLASS(ASorcBall2, false, false, false, false)
 
 // Third ball (green) - summons Bishops -------------------------------------
 
@@ -172,7 +172,7 @@ public:
 	virtual void CastSorcererSpell ();
 };
 
-IMPLEMENT_CLASS(ASorcBall3, false, false, false)
+IMPLEMENT_CLASS(ASorcBall3, false, false, false, false)
 
 // Sorcerer spell 1 (The burning, bouncing head thing) ----------------------
 
diff --git a/src/g_hexen/a_hexenspecialdecs.cpp b/src/g_hexen/a_hexenspecialdecs.cpp
index cad6f617d7..6d441ba57c 100644
--- a/src/g_hexen/a_hexenspecialdecs.cpp
+++ b/src/g_hexen/a_hexenspecialdecs.cpp
@@ -39,7 +39,7 @@ public:
 	void HitFloor ();
 };
 
-IMPLEMENT_CLASS(APottery1, false, false, false)
+IMPLEMENT_CLASS(APottery1, false, false, false, false)
 
 void APottery1::HitFloor ()
 {
@@ -136,7 +136,7 @@ public:
 	void PostBeginPlay ();
 };
 
-IMPLEMENT_CLASS(AZCorpseLynchedNoHeart, false, false, false)
+IMPLEMENT_CLASS(AZCorpseLynchedNoHeart, false, false, false, false)
 
 void AZCorpseLynchedNoHeart::PostBeginPlay ()
 {
@@ -344,7 +344,7 @@ public:
 	void Activate (AActor *activator);
 };
 
-IMPLEMENT_CLASS(AZBell, false, false, false)
+IMPLEMENT_CLASS(AZBell, false, false, false, false)
 
 void AZBell::Activate (AActor *activator)
 {
diff --git a/src/g_hexen/a_magecone.cpp b/src/g_hexen/a_magecone.cpp
index b2dd969b71..f2b97fcd9e 100644
--- a/src/g_hexen/a_magecone.cpp
+++ b/src/g_hexen/a_magecone.cpp
@@ -32,7 +32,7 @@ public:
 	int DoSpecialDamage (AActor *victim, int damage, FName damagetype);
 };
 
-IMPLEMENT_CLASS(AFrostMissile, false, false, false)
+IMPLEMENT_CLASS(AFrostMissile, false, false, false, false)
 
 int AFrostMissile::DoSpecialDamage (AActor *victim, int damage, FName damagetype)
 {
diff --git a/src/g_hexen/a_magelightning.cpp b/src/g_hexen/a_magelightning.cpp
index 039755ff50..7e11b64ed4 100644
--- a/src/g_hexen/a_magelightning.cpp
+++ b/src/g_hexen/a_magelightning.cpp
@@ -34,7 +34,7 @@ public:
 	int SpecialMissileHit (AActor *victim);
 };
 
-IMPLEMENT_CLASS(ALightning, false, false, false)
+IMPLEMENT_CLASS(ALightning, false, false, false, false)
 
 int ALightning::SpecialMissileHit (AActor *thing)
 {
@@ -87,7 +87,7 @@ public:
 	int SpecialMissileHit (AActor *thing);
 };
 
-IMPLEMENT_CLASS(ALightningZap, false, false, false)
+IMPLEMENT_CLASS(ALightningZap, false, false, false, false)
 
 int ALightningZap::SpecialMissileHit (AActor *thing)
 {
diff --git a/src/g_hexen/a_magestaff.cpp b/src/g_hexen/a_magestaff.cpp
index 2660117c39..acef2e5cdc 100644
--- a/src/g_hexen/a_magestaff.cpp
+++ b/src/g_hexen/a_magestaff.cpp
@@ -56,7 +56,7 @@ public:
 	BYTE MStaffCount;
 };
 
-IMPLEMENT_CLASS(AMWeapBloodscourge, false, false, false)
+IMPLEMENT_CLASS(AMWeapBloodscourge, false, false, false, false)
 
 // Mage Staff FX2 (Bloodscourge) --------------------------------------------
 
@@ -68,7 +68,7 @@ public:
 	bool SpecialBlastHandling (AActor *source, double strength);
 };
 
-IMPLEMENT_CLASS(AMageStaffFX2, false, false, false)
+IMPLEMENT_CLASS(AMageStaffFX2, false, false, false, false)
 
 int AMageStaffFX2::SpecialMissileHit (AActor *victim)
 {
diff --git a/src/g_hexen/a_pig.cpp b/src/g_hexen/a_pig.cpp
index c12a9f50ac..a0a0cc844b 100644
--- a/src/g_hexen/a_pig.cpp
+++ b/src/g_hexen/a_pig.cpp
@@ -27,7 +27,7 @@ public:
 	void MorphPlayerThink ();
 };
 
-IMPLEMENT_CLASS(APigPlayer, false, false, false)
+IMPLEMENT_CLASS(APigPlayer, false, false, false, false)
 
 void APigPlayer::MorphPlayerThink ()
 {
diff --git a/src/g_hexen/a_spike.cpp b/src/g_hexen/a_spike.cpp
index 1559467db1..9b2cb5d6e2 100644
--- a/src/g_hexen/a_spike.cpp
+++ b/src/g_hexen/a_spike.cpp
@@ -31,7 +31,7 @@ public:
 	TObjPtr<AActor> DirtClump;
 };
 
-IMPLEMENT_CLASS(AThrustFloor, false, true, false)
+IMPLEMENT_CLASS(AThrustFloor, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(AThrustFloor)
 	IMPLEMENT_POINTER(DirtClump)
diff --git a/src/g_hexen/a_summon.cpp b/src/g_hexen/a_summon.cpp
index e98c523520..7c0746c915 100644
--- a/src/g_hexen/a_summon.cpp
+++ b/src/g_hexen/a_summon.cpp
@@ -21,7 +21,7 @@ public:
 	bool Use (bool pickup);
 };
 
-IMPLEMENT_CLASS(AArtiDarkServant, false, false, false)
+IMPLEMENT_CLASS(AArtiDarkServant, false, false, false, false)
 
 //============================================================================
 //
diff --git a/src/g_hexen/a_teleportother.cpp b/src/g_hexen/a_teleportother.cpp
index 68ba73bc4b..4eeba53f99 100644
--- a/src/g_hexen/a_teleportother.cpp
+++ b/src/g_hexen/a_teleportother.cpp
@@ -34,7 +34,7 @@ public:
 	bool Use (bool pickup);
 };
 
-IMPLEMENT_CLASS(AArtiTeleportOther, false, false, false)
+IMPLEMENT_CLASS(AArtiTeleportOther, false, false, false, false)
 
 // Teleport Other FX --------------------------------------------------------
 
@@ -45,7 +45,7 @@ public:
 	int DoSpecialDamage (AActor *target, int damage, FName damagetype);
 };
 
-IMPLEMENT_CLASS(ATelOtherFX1, false, false, false)
+IMPLEMENT_CLASS(ATelOtherFX1, false, false, false, false)
 
 static void TeloSpawn (AActor *source, const char *type)
 {
diff --git a/src/g_level.cpp b/src/g_level.cpp
index e377d70f63..9a955a03ed 100644
--- a/src/g_level.cpp
+++ b/src/g_level.cpp
@@ -903,7 +903,7 @@ public:
 	void Tick ();
 };
 
-IMPLEMENT_CLASS(DAutosaver, false, false, false)
+IMPLEMENT_CLASS(DAutosaver, false, false, false, false)
 
 void DAutosaver::Tick ()
 {
diff --git a/src/g_raven/a_artitele.cpp b/src/g_raven/a_artitele.cpp
index 0910e5f230..35387df450 100644
--- a/src/g_raven/a_artitele.cpp
+++ b/src/g_raven/a_artitele.cpp
@@ -23,7 +23,7 @@ public:
 	bool Use (bool pickup);
 };
 
-IMPLEMENT_CLASS(AArtiTeleport, false, false, false)
+IMPLEMENT_CLASS(AArtiTeleport, false, false, false, false)
 
 bool AArtiTeleport::Use (bool pickup)
 {
diff --git a/src/g_raven/a_minotaur.cpp b/src/g_raven/a_minotaur.cpp
index c906234c85..36946ba871 100644
--- a/src/g_raven/a_minotaur.cpp
+++ b/src/g_raven/a_minotaur.cpp
@@ -31,7 +31,7 @@ void P_MinotaurSlam (AActor *source, AActor *target);
 
 DECLARE_ACTION(A_MinotaurLook)
 
-IMPLEMENT_CLASS(AMinotaur, false, false, false)
+IMPLEMENT_CLASS(AMinotaur, false, false, false, false)
 
 void AMinotaur::Tick ()
 {
@@ -72,7 +72,7 @@ int AMinotaur::DoSpecialDamage (AActor *target, int damage, FName damagetype)
 
 // Minotaur Friend ----------------------------------------------------------
 
-IMPLEMENT_CLASS(AMinotaurFriend, false, false, false)
+IMPLEMENT_CLASS(AMinotaurFriend, false, false, false, false)
 
 void AMinotaurFriend::BeginPlay ()
 {
diff --git a/src/g_shared/a_action.cpp b/src/g_shared/a_action.cpp
index 20ab4aad08..61be39a0e0 100644
--- a/src/g_shared/a_action.cpp
+++ b/src/g_shared/a_action.cpp
@@ -29,7 +29,7 @@ public:
 	void Deactivate (AActor *activator);
 };
 
-IMPLEMENT_CLASS(ASwitchableDecoration, false, false, false)
+IMPLEMENT_CLASS(ASwitchableDecoration, false, false, false, false)
 
 void ASwitchableDecoration::Activate (AActor *activator)
 {
@@ -50,7 +50,7 @@ public:
 	void Deactivate (AActor *activator) {}
 };
 
-IMPLEMENT_CLASS(ASwitchingDecoration, false, false, false)
+IMPLEMENT_CLASS(ASwitchingDecoration, false, false, false, false)
 
 //----------------------------------------------------------------------------
 //
@@ -304,7 +304,7 @@ private:
 	DCorpsePointer () {}
 };
 
-IMPLEMENT_CLASS(DCorpsePointer, false, true, false)
+IMPLEMENT_CLASS(DCorpsePointer, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DCorpsePointer)
 	IMPLEMENT_POINTER(Corpse)
diff --git a/src/g_shared/a_armor.cpp b/src/g_shared/a_armor.cpp
index b1935bd1d4..636441a9db 100644
--- a/src/g_shared/a_armor.cpp
+++ b/src/g_shared/a_armor.cpp
@@ -8,11 +8,11 @@
 #include "d_player.h"
 #include "serializer.h"
 
-IMPLEMENT_CLASS(AArmor, false, false, false)
-IMPLEMENT_CLASS(ABasicArmor, false, false, false)
-IMPLEMENT_CLASS(ABasicArmorPickup, false, false, false)
-IMPLEMENT_CLASS(ABasicArmorBonus, false, false, false)
-IMPLEMENT_CLASS(AHexenArmor, false, false, false)
+IMPLEMENT_CLASS(AArmor, false, false, false, false)
+IMPLEMENT_CLASS(ABasicArmor, false, false, false, false)
+IMPLEMENT_CLASS(ABasicArmorPickup, false, false, false, false)
+IMPLEMENT_CLASS(ABasicArmorBonus, false, false, false, false)
+IMPLEMENT_CLASS(AHexenArmor, false, false, false, false)
 
 //===========================================================================
 //
diff --git a/src/g_shared/a_artifacts.cpp b/src/g_shared/a_artifacts.cpp
index 97771021de..7cf05613ab 100644
--- a/src/g_shared/a_artifacts.cpp
+++ b/src/g_shared/a_artifacts.cpp
@@ -40,11 +40,11 @@ static FRandom pr_torch ("Torch");
 #define	TIMEFREEZE_TICS	( 12 * TICRATE )
 */
 
-IMPLEMENT_CLASS(APowerup, false, false, false)
+IMPLEMENT_CLASS(APowerup, false, false, false, false)
 
 // Powerup-Giver -------------------------------------------------------------
 
-IMPLEMENT_CLASS(PClassPowerupGiver, false, false, false)
+IMPLEMENT_CLASS(PClassPowerupGiver, false, false, false, false)
 
 void PClassPowerupGiver::ReplaceClassRef(PClass *oldclass, PClass *newclass)
 {
@@ -376,7 +376,7 @@ bool APowerup::GetNoTeleportFreeze ()
 
 // Invulnerability Powerup ---------------------------------------------------
 
-IMPLEMENT_CLASS(APowerInvulnerable, false, false, false)
+IMPLEMENT_CLASS(APowerInvulnerable, false, false, false, false)
 
 //===========================================================================
 //
@@ -513,7 +513,7 @@ int APowerInvulnerable::AlterWeaponSprite (visstyle_t *vis)
 
 // Strength (aka Berserk) Powerup --------------------------------------------
 
-IMPLEMENT_CLASS(APowerStrength, false, false, false)
+IMPLEMENT_CLASS(APowerStrength, false, false, false, false)
 
 //===========================================================================
 //
@@ -578,7 +578,7 @@ PalEntry APowerStrength::GetBlend ()
 
 // Invisibility Powerup ------------------------------------------------------
 
-IMPLEMENT_CLASS(APowerInvisibility, false, false, false)
+IMPLEMENT_CLASS(APowerInvisibility, false, false, false, false)
 
 // Invisibility flag combos
 #define INVISIBILITY_FLAGS1	(MF_SHADOW)
@@ -783,7 +783,7 @@ bool APowerInvisibility::HandlePickup (AInventory *item)
 
 // Ironfeet Powerup ----------------------------------------------------------
 
-IMPLEMENT_CLASS(APowerIronFeet, false, false, false)
+IMPLEMENT_CLASS(APowerIronFeet, false, false, false, false)
 
 //===========================================================================
 //
@@ -820,7 +820,7 @@ void APowerIronFeet::DoEffect ()
 
 // Strife Environment Suit Powerup -------------------------------------------
 
-IMPLEMENT_CLASS(APowerMask, false, false, false)
+IMPLEMENT_CLASS(APowerMask, false, false, false, false)
 
 //===========================================================================
 //
@@ -857,7 +857,7 @@ void APowerMask::DoEffect ()
 
 // Light-Amp Powerup ---------------------------------------------------------
 
-IMPLEMENT_CLASS(APowerLightAmp, false, false, false)
+IMPLEMENT_CLASS(APowerLightAmp, false, false, false, false)
 
 //===========================================================================
 //
@@ -899,7 +899,7 @@ void APowerLightAmp::EndEffect ()
 
 // Torch Powerup -------------------------------------------------------------
 
-IMPLEMENT_CLASS(APowerTorch, false, false, false)
+IMPLEMENT_CLASS(APowerTorch, false, false, false, false)
 
 //===========================================================================
 //
@@ -962,7 +962,7 @@ void APowerTorch::DoEffect ()
 
 // Flight (aka Wings of Wrath) powerup ---------------------------------------
 
-IMPLEMENT_CLASS(APowerFlight, false, false, false)
+IMPLEMENT_CLASS(APowerFlight, false, false, false, false)
 
 //===========================================================================
 //
@@ -1102,7 +1102,7 @@ bool APowerFlight::DrawPowerup (int x, int y)
 
 // Weapon Level 2 (aka Tome of Power) Powerup --------------------------------
 
-IMPLEMENT_CLASS(APowerWeaponLevel2, false, false, false)
+IMPLEMENT_CLASS(APowerWeaponLevel2, false, false, false, false)
 
 //===========================================================================
 //
@@ -1193,7 +1193,7 @@ public:
 	void Tick ();
 };
 
-IMPLEMENT_CLASS(APlayerSpeedTrail, false, false, false)
+IMPLEMENT_CLASS(APlayerSpeedTrail, false, false, false, false)
 
 //===========================================================================
 //
@@ -1216,7 +1216,7 @@ void APlayerSpeedTrail::Tick ()
 
 // Speed Powerup -------------------------------------------------------------
 
-IMPLEMENT_CLASS(APowerSpeed, false, false, false)
+IMPLEMENT_CLASS(APowerSpeed, false, false, false, false)
 
 //===========================================================================
 //
@@ -1303,11 +1303,11 @@ void APowerSpeed::DoEffect ()
 
 // Minotaur (aka Dark Servant) powerup ---------------------------------------
 
-IMPLEMENT_CLASS(APowerMinotaur, false, false, false)
+IMPLEMENT_CLASS(APowerMinotaur, false, false, false, false)
 
 // Targeter powerup ---------------------------------------------------------
 
-IMPLEMENT_CLASS(APowerTargeter, false, false, false)
+IMPLEMENT_CLASS(APowerTargeter, false, false, false, false)
 
 void APowerTargeter::Travelled ()
 {
@@ -1422,7 +1422,7 @@ void APowerTargeter::PositionAccuracy ()
 
 // Frightener Powerup --------------------------------
 
-IMPLEMENT_CLASS(APowerFrightener, false, false, false)
+IMPLEMENT_CLASS(APowerFrightener, false, false, false, false)
 
 //===========================================================================
 //
@@ -1458,7 +1458,7 @@ void APowerFrightener::EndEffect ()
 
 // Buddha Powerup --------------------------------
 
-IMPLEMENT_CLASS(APowerBuddha, false, false, false)
+IMPLEMENT_CLASS(APowerBuddha, false, false, false, false)
 
 //===========================================================================
 //
@@ -1494,11 +1494,11 @@ void APowerBuddha::EndEffect ()
 
 // Scanner powerup ----------------------------------------------------------
 
-IMPLEMENT_CLASS(APowerScanner, false, false, false)
+IMPLEMENT_CLASS(APowerScanner, false, false, false, false)
 
 // Time freezer powerup -----------------------------------------------------
 
-IMPLEMENT_CLASS( APowerTimeFreezer, false, false, false)
+IMPLEMENT_CLASS( APowerTimeFreezer, false, false, false, false)
 
 //===========================================================================
 //
@@ -1625,7 +1625,7 @@ void APowerTimeFreezer::EndEffect()
 
 // Damage powerup ------------------------------------------------------
 
-IMPLEMENT_CLASS(APowerDamage, false, false, false)
+IMPLEMENT_CLASS(APowerDamage, false, false, false, false)
 
 //===========================================================================
 //
@@ -1682,7 +1682,7 @@ void APowerDamage::ModifyDamage(int damage, FName damageType, int &newdamage, bo
 
 // Quarter damage powerup ------------------------------------------------------
 
-IMPLEMENT_CLASS(APowerProtection, false, false, false)
+IMPLEMENT_CLASS(APowerProtection, false, false, false, false)
 
 #define PROTECTION_FLAGS3	(MF3_NORADIUSDMG | MF3_DONTMORPH | MF3_DONTSQUASH | MF3_DONTBLAST | MF3_NOTELEOTHER)
 #define PROTECTION_FLAGS5	(MF5_NOPAIN | MF5_DONTRIP)
@@ -1760,7 +1760,7 @@ void APowerProtection::ModifyDamage(int damage, FName damageType, int &newdamage
 
 // Drain rune -------------------------------------------------------
 
-IMPLEMENT_CLASS(APowerDrain, false, false, false)
+IMPLEMENT_CLASS(APowerDrain, false, false, false, false)
 
 //===========================================================================
 //
@@ -1800,7 +1800,7 @@ void APowerDrain::EndEffect( )
 
 // Regeneration rune -------------------------------------------------------
 
-IMPLEMENT_CLASS(APowerRegeneration, false, false, false)
+IMPLEMENT_CLASS(APowerRegeneration, false, false, false, false)
 
 //===========================================================================
 //
@@ -1822,7 +1822,7 @@ void APowerRegeneration::DoEffect()
 
 // High jump rune -------------------------------------------------------
 
-IMPLEMENT_CLASS(APowerHighJump, false, false, false)
+IMPLEMENT_CLASS(APowerHighJump, false, false, false, false)
 
 //===========================================================================
 //
@@ -1860,7 +1860,7 @@ void APowerHighJump::EndEffect( )
 
 // Double firing speed rune ---------------------------------------------
 
-IMPLEMENT_CLASS(APowerDoubleFiringSpeed, false, false, false)
+IMPLEMENT_CLASS(APowerDoubleFiringSpeed, false, false, false, false)
 
 //===========================================================================
 //
@@ -1898,7 +1898,7 @@ void APowerDoubleFiringSpeed::EndEffect( )
 
 // Morph powerup ------------------------------------------------------
 
-IMPLEMENT_CLASS(APowerMorph, false, false, false)
+IMPLEMENT_CLASS(APowerMorph, false, false, false, false)
 
 //===========================================================================
 //
@@ -2002,7 +2002,7 @@ void APowerMorph::EndEffect( )
 
 // Infinite Ammo Powerup -----------------------------------------------------
 
-IMPLEMENT_CLASS(APowerInfiniteAmmo, false, false, false)
+IMPLEMENT_CLASS(APowerInfiniteAmmo, false, false, false, false)
 
 //===========================================================================
 //
diff --git a/src/g_shared/a_bridge.cpp b/src/g_shared/a_bridge.cpp
index 6409a07099..ab0df27e14 100644
--- a/src/g_shared/a_bridge.cpp
+++ b/src/g_shared/a_bridge.cpp
@@ -41,7 +41,7 @@ public:
 	void Destroy();
 };
 
-IMPLEMENT_CLASS(ACustomBridge, false, false, false)
+IMPLEMENT_CLASS(ACustomBridge, false, false, false, false)
 
 void ACustomBridge::BeginPlay ()
 {
@@ -156,7 +156,7 @@ public:
 	void BeginPlay ();
 };
 
-IMPLEMENT_CLASS(AInvisibleBridge, false, false, false)
+IMPLEMENT_CLASS(AInvisibleBridge, false, false, false, false)
 
 void AInvisibleBridge::BeginPlay ()
 {
diff --git a/src/g_shared/a_camera.cpp b/src/g_shared/a_camera.cpp
index a29b4b81da..ae34c3cbc3 100644
--- a/src/g_shared/a_camera.cpp
+++ b/src/g_shared/a_camera.cpp
@@ -64,7 +64,7 @@ protected:
 	DAngle Range;
 };
 
-IMPLEMENT_CLASS(ASecurityCamera, false, false, false)
+IMPLEMENT_CLASS(ASecurityCamera, false, false, false, false)
 
 void ASecurityCamera::Serialize(FSerializer &arc)
 {
@@ -124,7 +124,7 @@ protected:
 	DAngle MaxPitchChange;
 };
 
-IMPLEMENT_CLASS(AAimingCamera, false, false, false)
+IMPLEMENT_CLASS(AAimingCamera, false, false, false, false)
 
 void AAimingCamera::Serialize(FSerializer &arc)
 {
diff --git a/src/g_shared/a_debris.cpp b/src/g_shared/a_debris.cpp
index 9624ff5d66..3be3c22409 100644
--- a/src/g_shared/a_debris.cpp
+++ b/src/g_shared/a_debris.cpp
@@ -25,7 +25,7 @@ public:
 	}
 };
 
-IMPLEMENT_CLASS(AGlassShard, false, false, false)
+IMPLEMENT_CLASS(AGlassShard, false, false, false, false)
 
 // Dirt stuff
 
diff --git a/src/g_shared/a_decals.cpp b/src/g_shared/a_decals.cpp
index 5347664f53..06563f9954 100644
--- a/src/g_shared/a_decals.cpp
+++ b/src/g_shared/a_decals.cpp
@@ -58,14 +58,14 @@ static int ImpactCount;
 
 CVAR (Bool, cl_spreaddecals, true, CVAR_ARCHIVE)
 
-IMPLEMENT_CLASS(DBaseDecal, false, true, false)
+IMPLEMENT_CLASS(DBaseDecal, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DBaseDecal)
 	IMPLEMENT_POINTER(WallPrev)
 	IMPLEMENT_POINTER(WallNext)
 IMPLEMENT_POINTERS_END
 
-IMPLEMENT_CLASS(DImpactDecal, false, false, false)
+IMPLEMENT_CLASS(DImpactDecal, false, false, false, false)
 
 DBaseDecal::DBaseDecal ()
 : DThinker(STAT_DECAL),
@@ -746,7 +746,7 @@ public:
 	void BeginPlay ();
 };
 
-IMPLEMENT_CLASS(ADecal, false, false, false)
+IMPLEMENT_CLASS(ADecal, false, false, false, false)
 
 void ADecal::BeginPlay ()
 {
diff --git a/src/g_shared/a_fastprojectile.cpp b/src/g_shared/a_fastprojectile.cpp
index a0774a6f6f..ffca8a8fad 100644
--- a/src/g_shared/a_fastprojectile.cpp
+++ b/src/g_shared/a_fastprojectile.cpp
@@ -7,7 +7,7 @@
 #include "b_bot.h"
 #include "p_checkposition.h"
 
-IMPLEMENT_CLASS(AFastProjectile, false, false, false)
+IMPLEMENT_CLASS(AFastProjectile, false, false, false, false)
 
 
 //----------------------------------------------------------------------------
diff --git a/src/g_shared/a_flashfader.cpp b/src/g_shared/a_flashfader.cpp
index 8406ec2996..8602f7a864 100644
--- a/src/g_shared/a_flashfader.cpp
+++ b/src/g_shared/a_flashfader.cpp
@@ -3,7 +3,7 @@
 #include "d_player.h"
 #include "serializer.h"
 
-IMPLEMENT_CLASS(DFlashFader, false, true, false)
+IMPLEMENT_CLASS(DFlashFader, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DFlashFader)
 	IMPLEMENT_POINTER(ForWho)
diff --git a/src/g_shared/a_fountain.cpp b/src/g_shared/a_fountain.cpp
index bd415e729b..e89745fc79 100644
--- a/src/g_shared/a_fountain.cpp
+++ b/src/g_shared/a_fountain.cpp
@@ -46,7 +46,7 @@ public:
 	void Deactivate (AActor *activator);
 };
 
-IMPLEMENT_CLASS(AParticleFountain, false, false, false)
+IMPLEMENT_CLASS(AParticleFountain, false, false, false, false)
 
 void AParticleFountain::PostBeginPlay ()
 {
diff --git a/src/g_shared/a_hatetarget.cpp b/src/g_shared/a_hatetarget.cpp
index 361ccb1f26..7d25bdb31d 100644
--- a/src/g_shared/a_hatetarget.cpp
+++ b/src/g_shared/a_hatetarget.cpp
@@ -46,7 +46,7 @@ public:
 	int TakeSpecialDamage(AActor *inflictor, AActor *source, int damage, FName damagetype);
 };
 
-IMPLEMENT_CLASS(AHateTarget, false, false, false)
+IMPLEMENT_CLASS(AHateTarget, false, false, false, false)
 
 void AHateTarget::BeginPlay()
 {
diff --git a/src/g_shared/a_keys.cpp b/src/g_shared/a_keys.cpp
index 07685be31b..69fbe48afb 100644
--- a/src/g_shared/a_keys.cpp
+++ b/src/g_shared/a_keys.cpp
@@ -470,7 +470,7 @@ bool P_CheckKeys (AActor *owner, int keynum, bool remote)
 //
 //==========================================================================
 
-IMPLEMENT_CLASS(AKey, false, false, false)
+IMPLEMENT_CLASS(AKey, false, false, false, false)
 
 bool AKey::HandlePickup (AInventory *item)
 {
diff --git a/src/g_shared/a_lightning.cpp b/src/g_shared/a_lightning.cpp
index 0fe3683da4..f00560fc80 100644
--- a/src/g_shared/a_lightning.cpp
+++ b/src/g_shared/a_lightning.cpp
@@ -13,7 +13,7 @@
 
 static FRandom pr_lightning ("Lightning");
 
-IMPLEMENT_CLASS(DLightningThinker, false, false, false)
+IMPLEMENT_CLASS(DLightningThinker, false, false, false, false)
 
 DLightningThinker::DLightningThinker ()
 	: DThinker (STAT_LIGHTNING)
diff --git a/src/g_shared/a_mapmarker.cpp b/src/g_shared/a_mapmarker.cpp
index 3c4d99b30b..d874042c5f 100644
--- a/src/g_shared/a_mapmarker.cpp
+++ b/src/g_shared/a_mapmarker.cpp
@@ -51,7 +51,7 @@
 //
 //--------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(AMapMarker, false, false, false)
+IMPLEMENT_CLASS(AMapMarker, false, false, false, false)
 
 void AMapMarker::BeginPlay ()
 {
diff --git a/src/g_shared/a_morph.cpp b/src/g_shared/a_morph.cpp
index 9ce33e12da..506f18b2ff 100644
--- a/src/g_shared/a_morph.cpp
+++ b/src/g_shared/a_morph.cpp
@@ -616,7 +616,7 @@ void InitAllPowerupEffects(AInventory *item)
 
 // Base class for morphing projectiles --------------------------------------
 
-IMPLEMENT_CLASS(AMorphProjectile, false, false, false)
+IMPLEMENT_CLASS(AMorphProjectile, false, false, false, false)
 
 int AMorphProjectile::DoSpecialDamage (AActor *target, int damage, FName damagetype)
 {
@@ -650,7 +650,7 @@ void AMorphProjectile::Serialize(FSerializer &arc)
 
 // Morphed Monster (you must subclass this to do something useful) ---------
 
-IMPLEMENT_CLASS(AMorphedMonster, false, true, false)
+IMPLEMENT_CLASS(AMorphedMonster, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(AMorphedMonster)
 	IMPLEMENT_POINTER(UnmorphedMe)
diff --git a/src/g_shared/a_movingcamera.cpp b/src/g_shared/a_movingcamera.cpp
index 89a1193cc4..030f5d3683 100644
--- a/src/g_shared/a_movingcamera.cpp
+++ b/src/g_shared/a_movingcamera.cpp
@@ -66,7 +66,7 @@ public:
 	TObjPtr<AInterpolationPoint> Next;
 };
 
-IMPLEMENT_CLASS(AInterpolationPoint, false, true, false)
+IMPLEMENT_CLASS(AInterpolationPoint, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(AInterpolationPoint)
 	IMPLEMENT_POINTER(Next)
@@ -135,7 +135,7 @@ public:
 	void Tick () {}		// Does absolutely nothing itself
 };
 
-IMPLEMENT_CLASS(AInterpolationSpecial, false, false, false)
+IMPLEMENT_CLASS(AInterpolationSpecial, false, false, false, false)
 
 /*
 == PathFollower: something that follows a camera path
@@ -178,7 +178,7 @@ protected:
 	int HoldTime;
 };
 
-IMPLEMENT_CLASS(APathFollower, false, true, false)
+IMPLEMENT_CLASS(APathFollower, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(APathFollower)
 	IMPLEMENT_POINTER(PrevNode)
@@ -480,7 +480,7 @@ protected:
 	bool Interpolate ();
 };
 
-IMPLEMENT_CLASS(AActorMover, false, false, false)
+IMPLEMENT_CLASS(AActorMover, false, false, false, false)
 
 void AActorMover::BeginPlay()
 {
@@ -596,7 +596,7 @@ protected:
 	TObjPtr<AActor> Activator;
 };
 
-IMPLEMENT_CLASS(AMovingCamera, false, true, false)
+IMPLEMENT_CLASS(AMovingCamera, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(AMovingCamera)
 	IMPLEMENT_POINTER(Activator)
diff --git a/src/g_shared/a_pickups.cpp b/src/g_shared/a_pickups.cpp
index 2b7fcb79a2..223a2f75f8 100644
--- a/src/g_shared/a_pickups.cpp
+++ b/src/g_shared/a_pickups.cpp
@@ -24,7 +24,7 @@
 
 static FRandom pr_restore ("RestorePos");
 
-IMPLEMENT_CLASS(PClassInventory, false, false, false)
+IMPLEMENT_CLASS(PClassInventory, false, false, false, false)
 
 PClassInventory::PClassInventory()
 {
@@ -71,7 +71,7 @@ void PClassInventory::Finalize(FStateDefinitions &statedef)
 	((AActor*)Defaults)->flags |= MF_SPECIAL;
 }
 
-IMPLEMENT_CLASS(PClassAmmo, false, false, false)
+IMPLEMENT_CLASS(PClassAmmo, false, false, false, false)
 
 PClassAmmo::PClassAmmo()
 {
@@ -87,7 +87,7 @@ void PClassAmmo::DeriveData(PClass *newclass)
 	newc->DropAmount = DropAmount;
 }
 
-IMPLEMENT_CLASS(AAmmo, false, false, false)
+IMPLEMENT_CLASS(AAmmo, false, false, false, false)
 
 //===========================================================================
 //
@@ -470,7 +470,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_RestoreSpecialPosition)
 int AInventory::StaticLastMessageTic;
 const char *AInventory::StaticLastMessage;
 
-IMPLEMENT_CLASS(AInventory, false, true, false)
+IMPLEMENT_CLASS(AInventory, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(AInventory)
 	IMPLEMENT_POINTER(Owner)
@@ -1354,7 +1354,7 @@ bool AInventory::DrawPowerup (int x, int y)
 /* AArtifact implementation												   */
 /***************************************************************************/
 
-IMPLEMENT_CLASS(APowerupGiver, false, false, false)
+IMPLEMENT_CLASS(APowerupGiver, false, false, false, false)
 
 //===========================================================================
 //
@@ -1644,8 +1644,8 @@ void AInventory::DetachFromOwner ()
 {
 }
 
-IMPLEMENT_CLASS(AStateProvider, false, false, false)
-IMPLEMENT_CLASS(ACustomInventory, false, false, false)
+IMPLEMENT_CLASS(AStateProvider, false, false, false, false)
+IMPLEMENT_CLASS(ACustomInventory, false, false, false, false)
 
 //===========================================================================
 //
@@ -1690,7 +1690,7 @@ bool ACustomInventory::TryPickup (AActor *&toucher)
 	return useok;
 }
 
-IMPLEMENT_CLASS(PClassHealth, false, false, false)
+IMPLEMENT_CLASS(PClassHealth, false, false, false, false)
 
 //===========================================================================
 //
@@ -1719,7 +1719,7 @@ void PClassHealth::DeriveData(PClass *newclass)
 	newc->LowHealthMessage = LowHealthMessage;
 }
 
-IMPLEMENT_CLASS(AHealth, false, false, false)
+IMPLEMENT_CLASS(AHealth, false, false, false, false)
 
 //===========================================================================
 //
@@ -1762,7 +1762,7 @@ bool AHealth::TryPickup (AActor *&other)
 	return false;
 }
 
-IMPLEMENT_CLASS(AHealthPickup, false, false, false)
+IMPLEMENT_CLASS(AHealthPickup, false, false, false, false)
 
 //===========================================================================
 //
@@ -2015,8 +2015,8 @@ void ABackpackItem::DetachFromOwner ()
 //
 //===========================================================================
 
-IMPLEMENT_CLASS(ABackpackItem, false, false, false)
-IMPLEMENT_CLASS(AMapRevealer, false, false, false)
+IMPLEMENT_CLASS(ABackpackItem, false, false, false, false)
+IMPLEMENT_CLASS(AMapRevealer, false, false, false, false)
 
 //===========================================================================
 //
@@ -2041,7 +2041,7 @@ bool AMapRevealer::TryPickup (AActor *&toucher)
 //
 //===========================================================================
 
-IMPLEMENT_CLASS(AScoreItem, false, false, false)
+IMPLEMENT_CLASS(AScoreItem, false, false, false, false)
 
 //===========================================================================
 //
diff --git a/src/g_shared/a_puzzleitems.cpp b/src/g_shared/a_puzzleitems.cpp
index ba3f90dc80..d243dc73cb 100644
--- a/src/g_shared/a_puzzleitems.cpp
+++ b/src/g_shared/a_puzzleitems.cpp
@@ -8,7 +8,7 @@
 #include "doomstat.h"
 #include "v_font.h"
 
-IMPLEMENT_CLASS(PClassPuzzleItem, false, false, false)
+IMPLEMENT_CLASS(PClassPuzzleItem, false, false, false, false)
 
 void PClassPuzzleItem::DeriveData(PClass *newclass)
 {
@@ -17,7 +17,7 @@ void PClassPuzzleItem::DeriveData(PClass *newclass)
 	static_cast<PClassPuzzleItem *>(newclass)->PuzzFailMessage = PuzzFailMessage;
 }
 
-IMPLEMENT_CLASS(APuzzleItem, false, false, false)
+IMPLEMENT_CLASS(APuzzleItem, false, false, false, false)
 
 bool APuzzleItem::HandlePickup (AInventory *item)
 {
diff --git a/src/g_shared/a_quake.cpp b/src/g_shared/a_quake.cpp
index d2a2e5e5b0..80a53ee080 100644
--- a/src/g_shared/a_quake.cpp
+++ b/src/g_shared/a_quake.cpp
@@ -14,7 +14,7 @@
 
 static FRandom pr_quake ("Quake");
 
-IMPLEMENT_CLASS(DEarthquake, false, true, false)
+IMPLEMENT_CLASS(DEarthquake, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DEarthquake)
 	IMPLEMENT_POINTER(m_Spot)
diff --git a/src/g_shared/a_randomspawner.cpp b/src/g_shared/a_randomspawner.cpp
index ca85a13490..2b2c82956c 100644
--- a/src/g_shared/a_randomspawner.cpp
+++ b/src/g_shared/a_randomspawner.cpp
@@ -231,4 +231,4 @@ class ARandomSpawner : public AActor
 
 };
 
-IMPLEMENT_CLASS(ARandomSpawner, false, false, false)
+IMPLEMENT_CLASS(ARandomSpawner, false, false, false, false)
diff --git a/src/g_shared/a_secrettrigger.cpp b/src/g_shared/a_secrettrigger.cpp
index 7128565715..372cef07d8 100644
--- a/src/g_shared/a_secrettrigger.cpp
+++ b/src/g_shared/a_secrettrigger.cpp
@@ -50,7 +50,7 @@ public:
 	void Activate (AActor *activator);
 };
 
-IMPLEMENT_CLASS(ASecretTrigger, false, false, false)
+IMPLEMENT_CLASS(ASecretTrigger, false, false, false, false)
 
 void ASecretTrigger::PostBeginPlay ()
 {
diff --git a/src/g_shared/a_sectoraction.cpp b/src/g_shared/a_sectoraction.cpp
index 88e504aa95..61a69b1b39 100644
--- a/src/g_shared/a_sectoraction.cpp
+++ b/src/g_shared/a_sectoraction.cpp
@@ -37,7 +37,7 @@
 
 // The base class for sector actions ----------------------------------------
 
-IMPLEMENT_CLASS(ASectorAction, false, false, false)
+IMPLEMENT_CLASS(ASectorAction, false, false, false, false)
 
 ASectorAction::ASectorAction (bool activatedByUse) :
 	ActivatedByUse (activatedByUse) {}
@@ -142,7 +142,7 @@ public:
 	bool DoTriggerAction (AActor *triggerer, int activationType);
 };
 
-IMPLEMENT_CLASS(ASecActEnter, false, false, false)
+IMPLEMENT_CLASS(ASecActEnter, false, false, false, false)
 
 
 bool ASecActEnter::DoTriggerAction (AActor *triggerer, int activationType)
@@ -160,7 +160,7 @@ public:
 	bool DoTriggerAction (AActor *triggerer, int activationType);
 };
 
-IMPLEMENT_CLASS(ASecActExit, false, false, false)
+IMPLEMENT_CLASS(ASecActExit, false, false, false, false)
 
 
 bool ASecActExit::DoTriggerAction (AActor *triggerer, int activationType)
@@ -181,7 +181,7 @@ public:
 // Skull Tag uses 9999 for a special that is triggered whenever
 // the player is on the sector's floor. I think this is more useful.
 
-IMPLEMENT_CLASS(ASecActHitFloor, false, false, false)
+IMPLEMENT_CLASS(ASecActHitFloor, false, false, false, false)
 
 
 bool ASecActHitFloor::DoTriggerAction (AActor *triggerer, int activationType)
@@ -199,7 +199,7 @@ public:
 	bool DoTriggerAction (AActor *triggerer, int activationType);
 };
 
-IMPLEMENT_CLASS(ASecActHitCeil, false, false, false)
+IMPLEMENT_CLASS(ASecActHitCeil, false, false, false, false)
 
 
 bool ASecActHitCeil::DoTriggerAction (AActor *triggerer, int activationType)
@@ -218,7 +218,7 @@ public:
 	bool DoTriggerAction (AActor *triggerer, int activationType);
 };
 
-IMPLEMENT_CLASS(ASecActUse, false, false, false)
+IMPLEMENT_CLASS(ASecActUse, false, false, false, false)
 
 
 bool ASecActUse::DoTriggerAction (AActor *triggerer, int activationType)
@@ -237,7 +237,7 @@ public:
 	bool DoTriggerAction (AActor *triggerer, int activationType);
 };
 
-IMPLEMENT_CLASS(ASecActUseWall, false, false, false)
+IMPLEMENT_CLASS(ASecActUseWall, false, false, false, false)
 
 
 bool ASecActUseWall::DoTriggerAction (AActor *triggerer, int activationType)
@@ -255,7 +255,7 @@ public:
 	bool DoTriggerAction (AActor *triggerer, int activationType);
 };
 
-IMPLEMENT_CLASS(ASecActEyesDive, false, false, false)
+IMPLEMENT_CLASS(ASecActEyesDive, false, false, false, false)
 
 
 bool ASecActEyesDive::DoTriggerAction (AActor *triggerer, int activationType)
@@ -273,7 +273,7 @@ public:
 	bool DoTriggerAction (AActor *triggerer, int activationType);
 };
 
-IMPLEMENT_CLASS(ASecActEyesSurface, false, false, false)
+IMPLEMENT_CLASS(ASecActEyesSurface, false, false, false, false)
 
 
 bool ASecActEyesSurface::DoTriggerAction (AActor *triggerer, int activationType)
@@ -291,7 +291,7 @@ public:
 	bool DoTriggerAction (AActor *triggerer, int activationType);
 };
 
-IMPLEMENT_CLASS(ASecActEyesBelowC, false, false, false)
+IMPLEMENT_CLASS(ASecActEyesBelowC, false, false, false, false)
 
 
 bool ASecActEyesBelowC::DoTriggerAction (AActor *triggerer, int activationType)
@@ -309,7 +309,7 @@ public:
 	bool DoTriggerAction (AActor *triggerer, int activationType);
 };
 
-IMPLEMENT_CLASS(ASecActEyesAboveC, false, false, false)
+IMPLEMENT_CLASS(ASecActEyesAboveC, false, false, false, false)
 
 
 bool ASecActEyesAboveC::DoTriggerAction (AActor *triggerer, int activationType)
@@ -327,7 +327,7 @@ public:
 	bool DoTriggerAction (AActor *triggerer, int activationType);
 };
 
-IMPLEMENT_CLASS(ASecActHitFakeFloor, false, false, false)
+IMPLEMENT_CLASS(ASecActHitFakeFloor, false, false, false, false)
 
 
 bool ASecActHitFakeFloor::DoTriggerAction (AActor *triggerer, int activationType)
diff --git a/src/g_shared/a_setcolor.cpp b/src/g_shared/a_setcolor.cpp
index 579c577065..585b9fcf61 100644
--- a/src/g_shared/a_setcolor.cpp
+++ b/src/g_shared/a_setcolor.cpp
@@ -15,7 +15,7 @@ class AColorSetter : public AActor
 
 };
 
-IMPLEMENT_CLASS(AColorSetter, false, false, false)
+IMPLEMENT_CLASS(AColorSetter, false, false, false, false)
 
 class AFadeSetter : public AActor
 {
@@ -30,4 +30,4 @@ class AFadeSetter : public AActor
 
 };
 
-IMPLEMENT_CLASS(AFadeSetter, false, false, false)
+IMPLEMENT_CLASS(AFadeSetter, false, false, false, false)
diff --git a/src/g_shared/a_skies.cpp b/src/g_shared/a_skies.cpp
index f58779387b..148a452e0c 100644
--- a/src/g_shared/a_skies.cpp
+++ b/src/g_shared/a_skies.cpp
@@ -42,7 +42,7 @@
 
 // arg0 = Visibility*4 for this skybox
 
-IMPLEMENT_CLASS(ASkyViewpoint, false, false, false)
+IMPLEMENT_CLASS(ASkyViewpoint, false, false, false, false)
 
 // If this actor has no TID, make it the default sky box
 void ASkyViewpoint::BeginPlay ()
@@ -73,7 +73,7 @@ void ASkyViewpoint::Destroy ()
 	Super::Destroy();
 }
 
-IMPLEMENT_CLASS(ASkyCamCompat, false, false, false)
+IMPLEMENT_CLASS(ASkyCamCompat, false, false, false, false)
 
 void ASkyCamCompat::BeginPlay()
 {
@@ -98,7 +98,7 @@ public:
 	void PostBeginPlay ();
 };
 
-IMPLEMENT_CLASS(ASkyPicker, false, false, false)
+IMPLEMENT_CLASS(ASkyPicker, false, false, false, false)
 
 void ASkyPicker::PostBeginPlay ()
 {
@@ -142,7 +142,7 @@ void ASkyPicker::PostBeginPlay ()
 
 // arg0 = opacity of plane; 0 = invisible, 255 = fully opaque
 
-IMPLEMENT_CLASS(AStackPoint, false, false, false)
+IMPLEMENT_CLASS(AStackPoint, false, false, false, false)
 
 void AStackPoint::BeginPlay ()
 {
@@ -160,7 +160,7 @@ public:
 	void Destroy ();
 };
 
-IMPLEMENT_CLASS(ASectorSilencer, false, false, false)
+IMPLEMENT_CLASS(ASectorSilencer, false, false, false, false)
 
 void ASectorSilencer::BeginPlay ()
 {
@@ -184,7 +184,7 @@ public:
 	void BeginPlay ();
 };
 
-IMPLEMENT_CLASS(ASectorFlagSetter, false, false, false)
+IMPLEMENT_CLASS(ASectorFlagSetter, false, false, false, false)
 
 void ASectorFlagSetter::BeginPlay ()
 {
diff --git a/src/g_shared/a_soundenvironment.cpp b/src/g_shared/a_soundenvironment.cpp
index 6d381dbe58..8e5cb133b5 100644
--- a/src/g_shared/a_soundenvironment.cpp
+++ b/src/g_shared/a_soundenvironment.cpp
@@ -46,7 +46,7 @@ public:
 	void Activate (AActor *deactivator);
 };
 
-IMPLEMENT_CLASS(ASoundEnvironment, false, false, false)
+IMPLEMENT_CLASS(ASoundEnvironment, false, false, false, false)
 
 void ASoundEnvironment::PostBeginPlay ()
 {
diff --git a/src/g_shared/a_soundsequence.cpp b/src/g_shared/a_soundsequence.cpp
index 01453fc9c2..25380a4c73 100644
--- a/src/g_shared/a_soundsequence.cpp
+++ b/src/g_shared/a_soundsequence.cpp
@@ -80,7 +80,7 @@ public:
 	TObjPtr<DSeqNode> Sequence;
 };
 
-IMPLEMENT_CLASS(ASoundSequenceSlot, false, true, false)
+IMPLEMENT_CLASS(ASoundSequenceSlot, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(ASoundSequenceSlot)
 	IMPLEMENT_POINTER(Sequence)
@@ -111,7 +111,7 @@ public:
 	void MarkPrecacheSounds () const;
 };
 
-IMPLEMENT_CLASS(ASoundSequence, false, false, false)
+IMPLEMENT_CLASS(ASoundSequence, false, false, false, false)
 
 //==========================================================================
 //
diff --git a/src/g_shared/a_spark.cpp b/src/g_shared/a_spark.cpp
index ce61480682..654ad710b1 100644
--- a/src/g_shared/a_spark.cpp
+++ b/src/g_shared/a_spark.cpp
@@ -45,7 +45,7 @@ public:
 	void Activate (AActor *activator);
 };
 
-IMPLEMENT_CLASS(ASpark, false, false, false)
+IMPLEMENT_CLASS(ASpark, false, false, false, false)
 
 void ASpark::Activate (AActor *activator)
 {
diff --git a/src/g_shared/a_specialspot.cpp b/src/g_shared/a_specialspot.cpp
index 1011fcb92a..86d0b5e8a3 100644
--- a/src/g_shared/a_specialspot.cpp
+++ b/src/g_shared/a_specialspot.cpp
@@ -45,8 +45,8 @@
 static FRandom pr_spot ("SpecialSpot");
 static FRandom pr_spawnmace ("SpawnMace");
 
-IMPLEMENT_CLASS(DSpotState, false, false, false)
-IMPLEMENT_CLASS(ASpecialSpot, false, false, false)
+IMPLEMENT_CLASS(DSpotState, false, false, false, false)
+IMPLEMENT_CLASS(ASpecialSpot, false, false, false, false)
 TObjPtr<DSpotState> DSpotState::SpotState;
 
 //----------------------------------------------------------------------------
diff --git a/src/g_shared/a_waterzone.cpp b/src/g_shared/a_waterzone.cpp
index 65cdf96f6d..556d08d7a6 100644
--- a/src/g_shared/a_waterzone.cpp
+++ b/src/g_shared/a_waterzone.cpp
@@ -42,7 +42,7 @@ public:
 	void PostBeginPlay ();
 };
 
-IMPLEMENT_CLASS(AWaterZone, false, false, false)
+IMPLEMENT_CLASS(AWaterZone, false, false, false, false)
 
 void AWaterZone::PostBeginPlay ()
 {
diff --git a/src/g_shared/a_weaponpiece.cpp b/src/g_shared/a_weaponpiece.cpp
index 68c631d9bd..7aa9591e9b 100644
--- a/src/g_shared/a_weaponpiece.cpp
+++ b/src/g_shared/a_weaponpiece.cpp
@@ -3,8 +3,8 @@
 #include "doomstat.h"
 #include "serializer.h"
 
-IMPLEMENT_CLASS(PClassWeaponPiece, false, false, false)
-IMPLEMENT_CLASS(AWeaponHolder, false, false, false)
+IMPLEMENT_CLASS(PClassWeaponPiece, false, false, false, false)
+IMPLEMENT_CLASS(AWeaponHolder, false, false, false, false)
 
 void PClassWeaponPiece::ReplaceClassRef(PClass *oldclass, PClass *newclass)
 {
@@ -24,7 +24,7 @@ void AWeaponHolder::Serialize(FSerializer &arc)
 		("pieceweapon", PieceWeapon);
 }
 
-IMPLEMENT_CLASS(AWeaponPiece, false, true, false)
+IMPLEMENT_CLASS(AWeaponPiece, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(AWeaponPiece)
 	IMPLEMENT_POINTER(FullWeapon)
diff --git a/src/g_shared/a_weapons.cpp b/src/g_shared/a_weapons.cpp
index adaf4c9e36..9063c6c2c7 100644
--- a/src/g_shared/a_weapons.cpp
+++ b/src/g_shared/a_weapons.cpp
@@ -21,7 +21,7 @@
 
 #define BONUSADD 6
 
-IMPLEMENT_CLASS(AWeapon, false, true, false)
+IMPLEMENT_CLASS(AWeapon, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(AWeapon)
 	IMPLEMENT_POINTER(Ammo1)
@@ -38,7 +38,7 @@ TMap<PClassWeapon *, int> Weapons_hton;
 
 static int ntoh_cmp(const void *a, const void *b);
 
-IMPLEMENT_CLASS(PClassWeapon, false, false, false)
+IMPLEMENT_CLASS(PClassWeapon, false, false, false, false)
 
 PClassWeapon::PClassWeapon()
 {
@@ -791,7 +791,7 @@ FState *AWeapon::GetStateForButtonName (FName button)
 
 /* Weapon giver ***********************************************************/
 
-IMPLEMENT_CLASS(AWeaponGiver, false, false, false)
+IMPLEMENT_CLASS(AWeaponGiver, false, false, false, false)
 
 void AWeaponGiver::Serialize(FSerializer &arc)
 {
diff --git a/src/g_shared/hudmessages.cpp b/src/g_shared/hudmessages.cpp
index 947f68ae4d..e9370ae793 100644
--- a/src/g_shared/hudmessages.cpp
+++ b/src/g_shared/hudmessages.cpp
@@ -44,15 +44,15 @@
 EXTERN_CVAR(Int, con_scaletext)
 int active_con_scaletext();
 
-IMPLEMENT_CLASS(DHUDMessage, false, true, false)
+IMPLEMENT_CLASS(DHUDMessage, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DHUDMessage)
 	IMPLEMENT_POINTER(Next)
 IMPLEMENT_POINTERS_END
 
-IMPLEMENT_CLASS(DHUDMessageFadeOut, false, false, false)
-IMPLEMENT_CLASS(DHUDMessageFadeInOut, false, false, false)
-IMPLEMENT_CLASS(DHUDMessageTypeOnFadeOut, false, false, false)
+IMPLEMENT_CLASS(DHUDMessageFadeOut, false, false, false, false)
+IMPLEMENT_CLASS(DHUDMessageFadeInOut, false, false, false, false)
+IMPLEMENT_CLASS(DHUDMessageTypeOnFadeOut, false, false, false, false)
 
 /*************************************************************************
  * Basic HUD message. Appears and disappears without any special effects *
diff --git a/src/g_shared/sbarinfo.cpp b/src/g_shared/sbarinfo.cpp
index 7675865adc..3041013119 100644
--- a/src/g_shared/sbarinfo.cpp
+++ b/src/g_shared/sbarinfo.cpp
@@ -1531,7 +1531,7 @@ private:
 	SBarInfoMainBlock *lastPopup;
 };
 
-IMPLEMENT_CLASS(DSBarInfo, false, true, false)
+IMPLEMENT_CLASS(DSBarInfo, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DSBarInfo)
 	IMPLEMENT_POINTER(ammo1)
diff --git a/src/g_shared/shared_sbar.cpp b/src/g_shared/shared_sbar.cpp
index abf48c6a16..4bc15d4bf6 100644
--- a/src/g_shared/shared_sbar.cpp
+++ b/src/g_shared/shared_sbar.cpp
@@ -62,7 +62,7 @@
 #define XHAIRPICKUPSIZE		(2+XHAIRSHRINKSIZE)
 #define POWERUPICONSIZE		32
 
-IMPLEMENT_CLASS(DBaseStatusBar, false, true, false)
+IMPLEMENT_CLASS(DBaseStatusBar, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DBaseStatusBar)
 	IMPLEMENT_POINTER(Messages[0])
diff --git a/src/g_strife/a_coin.cpp b/src/g_strife/a_coin.cpp
index 281c979213..87c4619d3c 100644
--- a/src/g_strife/a_coin.cpp
+++ b/src/g_strife/a_coin.cpp
@@ -6,7 +6,7 @@
 
 // Coin ---------------------------------------------------------------------
 
-IMPLEMENT_CLASS(ACoin, false, false, false)
+IMPLEMENT_CLASS(ACoin, false, false, false, false)
 
 const char *ACoin::PickupMessage ()
 {
diff --git a/src/g_strife/a_loremaster.cpp b/src/g_strife/a_loremaster.cpp
index 4bb2fec0e6..0f1bef7cca 100644
--- a/src/g_strife/a_loremaster.cpp
+++ b/src/g_strife/a_loremaster.cpp
@@ -17,7 +17,7 @@ public:
 	int DoSpecialDamage (AActor *victim, int damage, FName damagetype);
 };
 
-IMPLEMENT_CLASS(ALoreShot, false, false, false)
+IMPLEMENT_CLASS(ALoreShot, false, false, false, false)
 
 int ALoreShot::DoSpecialDamage (AActor *victim, int damage, FName damagetype)
 {
diff --git a/src/g_strife/a_programmer.cpp b/src/g_strife/a_programmer.cpp
index 70310eef2b..c00e7fb011 100644
--- a/src/g_strife/a_programmer.cpp
+++ b/src/g_strife/a_programmer.cpp
@@ -23,7 +23,7 @@ public:
 	PalEntry GetBlend ();
 };
 
-IMPLEMENT_CLASS(AProgLevelEnder, false, false, false)
+IMPLEMENT_CLASS(AProgLevelEnder, false, false, false, false)
 
 //============================================================================
 //
diff --git a/src/g_strife/a_rebels.cpp b/src/g_strife/a_rebels.cpp
index bef34d03ba..7f21886bf2 100644
--- a/src/g_strife/a_rebels.cpp
+++ b/src/g_strife/a_rebels.cpp
@@ -47,7 +47,7 @@ public:
 	bool Use (bool pickup);
 };
 
-IMPLEMENT_CLASS(ATeleporterBeacon, false, false, false)
+IMPLEMENT_CLASS(ATeleporterBeacon, false, false, false, false)
 
 bool ATeleporterBeacon::Use (bool pickup)
 {
diff --git a/src/g_strife/a_spectral.cpp b/src/g_strife/a_spectral.cpp
index d1dff1fb17..c7012accff 100644
--- a/src/g_strife/a_spectral.cpp
+++ b/src/g_strife/a_spectral.cpp
@@ -16,7 +16,7 @@ public:
 	void Touch (AActor *toucher);
 };
 
-IMPLEMENT_CLASS(ASpectralMonster, false, false, false)
+IMPLEMENT_CLASS(ASpectralMonster, false, false, false, false)
 
 void ASpectralMonster::Touch (AActor *toucher)
 {
diff --git a/src/g_strife/a_strifeitems.cpp b/src/g_strife/a_strifeitems.cpp
index f937da570d..c1b9d75d61 100644
--- a/src/g_strife/a_strifeitems.cpp
+++ b/src/g_strife/a_strifeitems.cpp
@@ -19,7 +19,7 @@
 */
 // Degnin Ore ---------------------------------------------------------------
 
-IMPLEMENT_CLASS(ADegninOre, false, false, false)
+IMPLEMENT_CLASS(ADegninOre, false, false, false, false)
 
 DEFINE_ACTION_FUNCTION(AActor, A_RemoveForceField)
 {
@@ -75,7 +75,7 @@ public:
 	bool TryPickup (AActor *&toucher);
 };
 
-IMPLEMENT_CLASS(AHealthTraining, false, false, false)
+IMPLEMENT_CLASS(AHealthTraining, false, false, false, false)
 
 bool AHealthTraining::TryPickup (AActor *&toucher)
 {
@@ -105,7 +105,7 @@ public:
 	bool Use (bool pickup);
 };
 
-IMPLEMENT_CLASS(AScanner, false, false, false)
+IMPLEMENT_CLASS(AScanner, false, false, false, false)
 
 bool AScanner::Use (bool pickup)
 {
@@ -130,7 +130,7 @@ public:
 	bool SpecialDropAction (AActor *dropper);
 };
 
-IMPLEMENT_CLASS(APrisonPass, false, false, false)
+IMPLEMENT_CLASS(APrisonPass, false, false, false, false)
 
 bool APrisonPass::TryPickup (AActor *&toucher)
 {
@@ -163,7 +163,7 @@ bool APrisonPass::SpecialDropAction (AActor *dropper)
 // actions and cannot be held. ----------------------------------------------
 //---------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(ADummyStrifeItem, false, false, false)
+IMPLEMENT_CLASS(ADummyStrifeItem, false, false, false, false)
 
 // Sound the alarm! ---------------------------------------------------------
 
@@ -175,7 +175,7 @@ public:
 	bool SpecialDropAction (AActor *dropper);
 };
 
-IMPLEMENT_CLASS(ARaiseAlarm, false, false, false)
+IMPLEMENT_CLASS(ARaiseAlarm, false, false, false, false)
 
 bool ARaiseAlarm::TryPickup (AActor *&toucher)
 {
@@ -209,7 +209,7 @@ public:
 	bool TryPickup (AActor *&toucher);
 };
 
-IMPLEMENT_CLASS(AOpenDoor222, false, false, false)
+IMPLEMENT_CLASS(AOpenDoor222, false, false, false, false)
 
 bool AOpenDoor222::TryPickup (AActor *&toucher)
 {
@@ -228,7 +228,7 @@ public:
 	bool SpecialDropAction (AActor *dropper);
 };
 
-IMPLEMENT_CLASS(ACloseDoor222, false, false, false)
+IMPLEMENT_CLASS(ACloseDoor222, false, false, false, false)
 
 bool ACloseDoor222::TryPickup (AActor *&toucher)
 {
@@ -262,7 +262,7 @@ public:
 	bool SpecialDropAction (AActor *dropper);
 };
 
-IMPLEMENT_CLASS(AOpenDoor224, false, false, false)
+IMPLEMENT_CLASS(AOpenDoor224, false, false, false, false)
 
 bool AOpenDoor224::TryPickup (AActor *&toucher)
 {
@@ -287,7 +287,7 @@ public:
 	bool TryPickup (AActor *&toucher);
 };
 
-IMPLEMENT_CLASS(AAmmoFillup, false, false, false)
+IMPLEMENT_CLASS(AAmmoFillup, false, false, false, false)
 
 bool AAmmoFillup::TryPickup (AActor *&toucher)
 {
@@ -325,7 +325,7 @@ public:
 	bool TryPickup (AActor *&toucher);
 };
 
-IMPLEMENT_CLASS(AHealthFillup, false, false, false)
+IMPLEMENT_CLASS(AHealthFillup, false, false, false, false)
 
 bool AHealthFillup::TryPickup (AActor *&toucher)
 {
@@ -342,7 +342,7 @@ bool AHealthFillup::TryPickup (AActor *&toucher)
 
 // Upgrade Stamina ----------------------------------------------------------
 
-IMPLEMENT_CLASS(AUpgradeStamina, false, false, false)
+IMPLEMENT_CLASS(AUpgradeStamina, false, false, false, false)
 
 bool AUpgradeStamina::TryPickup (AActor *&toucher)
 {
@@ -360,7 +360,7 @@ bool AUpgradeStamina::TryPickup (AActor *&toucher)
 
 // Upgrade Accuracy ---------------------------------------------------------
 
-IMPLEMENT_CLASS(AUpgradeAccuracy, false, false, false)
+IMPLEMENT_CLASS(AUpgradeAccuracy, false, false, false, false)
 
 bool AUpgradeAccuracy::TryPickup (AActor *&toucher)
 {
@@ -373,7 +373,7 @@ bool AUpgradeAccuracy::TryPickup (AActor *&toucher)
 
 // Start a slideshow --------------------------------------------------------
 
-IMPLEMENT_CLASS(ASlideshowStarter, false, false, false)
+IMPLEMENT_CLASS(ASlideshowStarter, false, false, false, false)
 
 bool ASlideshowStarter::TryPickup (AActor *&toucher)
 {
diff --git a/src/g_strife/a_strifestuff.cpp b/src/g_strife/a_strifestuff.cpp
index f4a724bc45..1580f127f4 100644
--- a/src/g_strife/a_strifestuff.cpp
+++ b/src/g_strife/a_strifestuff.cpp
@@ -72,7 +72,7 @@ public:
 	int TakeSpecialDamage (AActor *inflictor, AActor *source, int damage, FName damagetype);
 };
 
-IMPLEMENT_CLASS(AForceFieldGuard, false, false, false)
+IMPLEMENT_CLASS(AForceFieldGuard, false, false, false, false)
 
 int AForceFieldGuard::TakeSpecialDamage (AActor *inflictor, AActor *source, int damage, FName damagetype)
 {
@@ -197,7 +197,7 @@ public:
 	void Die (AActor *source, AActor *inflictor, int dmgflags);
 };
 
-IMPLEMENT_CLASS(APowerCoupling, false, false, false)
+IMPLEMENT_CLASS(APowerCoupling, false, false, false, false)
 
 void APowerCoupling::Die (AActor *source, AActor *inflictor, int dmgflags)
 {
@@ -239,7 +239,7 @@ public:
 	}
 };
 
-IMPLEMENT_CLASS(AMeat, false, false, false)
+IMPLEMENT_CLASS(AMeat, false, false, false, false)
 
 //==========================================================================
 //
diff --git a/src/g_strife/a_strifeweapons.cpp b/src/g_strife/a_strifeweapons.cpp
index ec153d675c..3e9eb69b6c 100644
--- a/src/g_strife/a_strifeweapons.cpp
+++ b/src/g_strife/a_strifeweapons.cpp
@@ -184,7 +184,7 @@ public:
 	int DoSpecialDamage (AActor *target, int damage, FName damagetype);
 };
 
-IMPLEMENT_CLASS(APoisonBolt, false, false, false)
+IMPLEMENT_CLASS(APoisonBolt, false, false, false, false)
 
 int APoisonBolt::DoSpecialDamage (AActor *target, int damage, FName damagetype)
 {
@@ -607,7 +607,7 @@ public:
 	int DoSpecialDamage (AActor *target, int damage, FName damagetype);
 };
 
-IMPLEMENT_CLASS(APhosphorousFire, false, false, false)
+IMPLEMENT_CLASS(APhosphorousFire, false, false, false, false)
 
 int APhosphorousFire::DoSpecialDamage (AActor *target, int damage, FName damagetype)
 {
@@ -734,7 +734,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_FireGrenade)
 
 // The Almighty Sigil! ------------------------------------------------------
 
-IMPLEMENT_CLASS(ASigil, false, false, false)
+IMPLEMENT_CLASS(ASigil, false, false, false, false)
 
 //============================================================================
 //
diff --git a/src/g_strife/strife_sbar.cpp b/src/g_strife/strife_sbar.cpp
index 3d00897778..73e31e6765 100644
--- a/src/g_strife/strife_sbar.cpp
+++ b/src/g_strife/strife_sbar.cpp
@@ -851,7 +851,7 @@ private:
 	double ItemFlash;
 };
 
-IMPLEMENT_CLASS(DStrifeStatusBar, false, false, false);
+IMPLEMENT_CLASS(DStrifeStatusBar, false, false, false, false);
 
 DBaseStatusBar *CreateStrifeStatusBar ()
 {
diff --git a/src/info.cpp b/src/info.cpp
index 3e14d7fed7..09d0905f6c 100644
--- a/src/info.cpp
+++ b/src/info.cpp
@@ -153,7 +153,7 @@ int GetSpriteIndex(const char * spritename, bool add)
 	return (lastindex = (int)sprites.Push (temp));
 }
 
-IMPLEMENT_CLASS(PClassActor, false, true, false)
+IMPLEMENT_CLASS(PClassActor, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(PClassActor)
 	IMPLEMENT_POINTER(DropItems)
diff --git a/src/intermission/intermission.cpp b/src/intermission/intermission.cpp
index 94288bfdfd..be8f58e19f 100644
--- a/src/intermission/intermission.cpp
+++ b/src/intermission/intermission.cpp
@@ -54,12 +54,12 @@
 
 FIntermissionDescriptorList IntermissionDescriptors;
 
-IMPLEMENT_CLASS(DIntermissionScreen, false, false, false)
-IMPLEMENT_CLASS(DIntermissionScreenFader, false, false, false)
-IMPLEMENT_CLASS(DIntermissionScreenText, false, false, false)
-IMPLEMENT_CLASS(DIntermissionScreenCast, false, false, false)
-IMPLEMENT_CLASS(DIntermissionScreenScroller, false, false, false)
-IMPLEMENT_CLASS(DIntermissionController, false, true, false)
+IMPLEMENT_CLASS(DIntermissionScreen, false, false, false, false)
+IMPLEMENT_CLASS(DIntermissionScreenFader, false, false, false, false)
+IMPLEMENT_CLASS(DIntermissionScreenText, false, false, false, false)
+IMPLEMENT_CLASS(DIntermissionScreenCast, false, false, false, false)
+IMPLEMENT_CLASS(DIntermissionScreenScroller, false, false, false, false)
+IMPLEMENT_CLASS(DIntermissionController, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DIntermissionController)
 	IMPLEMENT_POINTER(mScreen)
diff --git a/src/m_argv.cpp b/src/m_argv.cpp
index 924c9dd5c6..7d82ed834c 100644
--- a/src/m_argv.cpp
+++ b/src/m_argv.cpp
@@ -37,7 +37,7 @@
 #include "cmdlib.h"
 #include "i_system.h"
 
-IMPLEMENT_CLASS(DArgs, false, false, false)
+IMPLEMENT_CLASS(DArgs, false, false, false, false)
 
 //===========================================================================
 //
diff --git a/src/m_cheat.cpp b/src/m_cheat.cpp
index 94c1ef3df7..c53192ee7b 100644
--- a/src/m_cheat.cpp
+++ b/src/m_cheat.cpp
@@ -1033,7 +1033,7 @@ public:
 	}
 };
 
-IMPLEMENT_CLASS(DSuicider, false, true, false)
+IMPLEMENT_CLASS(DSuicider, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DSuicider)
 	IMPLEMENT_POINTER(Pawn)
diff --git a/src/menu/colorpickermenu.cpp b/src/menu/colorpickermenu.cpp
index 110ed2c3ea..639c6bbef3 100644
--- a/src/menu/colorpickermenu.cpp
+++ b/src/menu/colorpickermenu.cpp
@@ -331,7 +331,7 @@ public:
 	}
 };
 
-IMPLEMENT_CLASS(DColorPickerMenu, true, false, false)
+IMPLEMENT_CLASS(DColorPickerMenu, true, false, false, false)
 
 CCMD(undocolorpic)
 {
diff --git a/src/menu/joystickmenu.cpp b/src/menu/joystickmenu.cpp
index 8e05391a69..cca13ad44c 100644
--- a/src/menu/joystickmenu.cpp
+++ b/src/menu/joystickmenu.cpp
@@ -236,7 +236,7 @@ class DJoystickConfigMenu : public DOptionMenu
 	DECLARE_CLASS(DJoystickConfigMenu, DOptionMenu)
 };
 
-IMPLEMENT_CLASS(DJoystickConfigMenu, false, false, false)
+IMPLEMENT_CLASS(DJoystickConfigMenu, false, false, false, false)
 
 //=============================================================================
 //
diff --git a/src/menu/listmenu.cpp b/src/menu/listmenu.cpp
index 645636dadb..7fdd0c5bcf 100644
--- a/src/menu/listmenu.cpp
+++ b/src/menu/listmenu.cpp
@@ -42,7 +42,7 @@
 #include "d_event.h"
 #include "menu/menu.h"
 
-IMPLEMENT_CLASS(DListMenu, false, false, false)
+IMPLEMENT_CLASS(DListMenu, false, false, false, false)
 
 //=============================================================================
 //
diff --git a/src/menu/loadsavemenu.cpp b/src/menu/loadsavemenu.cpp
index 69976726e1..6d543228c4 100644
--- a/src/menu/loadsavemenu.cpp
+++ b/src/menu/loadsavemenu.cpp
@@ -119,7 +119,7 @@ public:
 
 };
 
-IMPLEMENT_CLASS(DLoadSaveMenu, false, false, false)
+IMPLEMENT_CLASS(DLoadSaveMenu, false, false, false, false)
 
 TArray<FSaveGameNode*> DLoadSaveMenu::SaveGames;
 int DLoadSaveMenu::LastSaved = -1;
@@ -934,7 +934,7 @@ public:
 
 };
 
-IMPLEMENT_CLASS(DSaveMenu, false, false, false)
+IMPLEMENT_CLASS(DSaveMenu, false, false, false, false)
 
 
 //=============================================================================
@@ -1102,7 +1102,7 @@ public:
 	bool MenuEvent (int mkey, bool fromcontroller);
 };
 
-IMPLEMENT_CLASS(DLoadMenu, false, false, false)
+IMPLEMENT_CLASS(DLoadMenu, false, false, false, false)
 
 
 //=============================================================================
diff --git a/src/menu/menu.cpp b/src/menu/menu.cpp
index 6717ffcf2a..6648c32b4f 100644
--- a/src/menu/menu.cpp
+++ b/src/menu/menu.cpp
@@ -91,7 +91,7 @@ static bool		MenuEnabled = true;
 //
 //============================================================================
 
-IMPLEMENT_CLASS(DMenu, false, true, false)
+IMPLEMENT_CLASS(DMenu, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DMenu)
 	IMPLEMENT_POINTER(mParentMenu)
diff --git a/src/menu/menuinput.cpp b/src/menu/menuinput.cpp
index 12ef4525d7..c33e9fed28 100644
--- a/src/menu/menuinput.cpp
+++ b/src/menu/menuinput.cpp
@@ -44,7 +44,7 @@
 // [TP] New #includes
 #include "v_text.h"
 
-IMPLEMENT_CLASS(DTextEnterMenu, true, false, false)
+IMPLEMENT_CLASS(DTextEnterMenu, true, false, false, false)
 
 #define INPUTGRID_WIDTH		13
 #define INPUTGRID_HEIGHT	5
diff --git a/src/menu/messagebox.cpp b/src/menu/messagebox.cpp
index 7915f44b30..de8fa10272 100644
--- a/src/menu/messagebox.cpp
+++ b/src/menu/messagebox.cpp
@@ -73,7 +73,7 @@ public:
 	virtual void HandleResult(bool res);
 };
 
-IMPLEMENT_CLASS(DMessageBoxMenu, false, false, false)
+IMPLEMENT_CLASS(DMessageBoxMenu, false, false, false, false)
 
 //=============================================================================
 //
@@ -365,7 +365,7 @@ public:
 	virtual void HandleResult(bool res);
 };
 
-IMPLEMENT_CLASS(DQuitMenu, false, false, false)
+IMPLEMENT_CLASS(DQuitMenu, false, false, false, false)
 
 //=============================================================================
 //
@@ -458,7 +458,7 @@ public:
 	virtual void HandleResult(bool res);
 };
 
-IMPLEMENT_CLASS(DEndGameMenu, false, false, false)
+IMPLEMENT_CLASS(DEndGameMenu, false, false, false, false)
 
 //=============================================================================
 //
@@ -536,7 +536,7 @@ public:
 	virtual void HandleResult(bool res);
 };
 
-IMPLEMENT_CLASS(DQuickSaveMenu, false, false, false)
+IMPLEMENT_CLASS(DQuickSaveMenu, false, false, false, false)
 
 //=============================================================================
 //
@@ -632,7 +632,7 @@ public:
 	virtual void HandleResult(bool res);
 };
 
-IMPLEMENT_CLASS(DQuickLoadMenu, false, false, false)
+IMPLEMENT_CLASS(DQuickLoadMenu, false, false, false, false)
 
 //=============================================================================
 //
diff --git a/src/menu/optionmenu.cpp b/src/menu/optionmenu.cpp
index 46bbae6655..1631c3d4b6 100644
--- a/src/menu/optionmenu.cpp
+++ b/src/menu/optionmenu.cpp
@@ -64,7 +64,7 @@ void M_DrawConText (int color, int x, int y, const char *str)
 		TAG_DONE);
 }
 
-IMPLEMENT_CLASS(DOptionMenu, false, false, false)
+IMPLEMENT_CLASS(DOptionMenu, false, false, false, false)
 
 //=============================================================================
 //
@@ -578,7 +578,7 @@ public:
 	}
 };
 
-IMPLEMENT_CLASS(DGameplayMenu, false, false, false)
+IMPLEMENT_CLASS(DGameplayMenu, false, false, false, false)
 
 class DCompatibilityMenu : public DOptionMenu
 {
@@ -600,4 +600,4 @@ public:
 	}
 };
 
-IMPLEMENT_CLASS(DCompatibilityMenu, false, false, false)
+IMPLEMENT_CLASS(DCompatibilityMenu, false, false, false, false)
diff --git a/src/menu/optionmenuitems.h b/src/menu/optionmenuitems.h
index 2d3c8c25f6..e83f4ada41 100644
--- a/src/menu/optionmenuitems.h
+++ b/src/menu/optionmenuitems.h
@@ -399,7 +399,7 @@ public:
 };
 
 #ifndef NO_IMP
-IMPLEMENT_CLASS(DEnterKey, true, false, false)
+IMPLEMENT_CLASS(DEnterKey, true, false, false, false)
 #endif
 
 //=============================================================================
diff --git a/src/menu/playermenu.cpp b/src/menu/playermenu.cpp
index bc22c8e12a..e32c7dd618 100644
--- a/src/menu/playermenu.cpp
+++ b/src/menu/playermenu.cpp
@@ -526,7 +526,7 @@ public:
 	void Drawer ();
 };
 
-IMPLEMENT_CLASS(DPlayerMenu, false, false, false)
+IMPLEMENT_CLASS(DPlayerMenu, false, false, false, false)
 
 //=============================================================================
 //
diff --git a/src/menu/readthis.cpp b/src/menu/readthis.cpp
index ce03ec84bb..0dfc47e736 100644
--- a/src/menu/readthis.cpp
+++ b/src/menu/readthis.cpp
@@ -54,7 +54,7 @@ public:
 	bool MouseEvent(int type, int x, int y);
 };
 
-IMPLEMENT_CLASS(DReadThisMenu, false, false, false)
+IMPLEMENT_CLASS(DReadThisMenu, false, false, false, false)
 
 //=============================================================================
 //
diff --git a/src/menu/videomenu.cpp b/src/menu/videomenu.cpp
index 6fec9ce6db..37f59149e6 100644
--- a/src/menu/videomenu.cpp
+++ b/src/menu/videomenu.cpp
@@ -183,7 +183,7 @@ public:
 	}
 };
 
-IMPLEMENT_CLASS(DVideoModeMenu, false, false, false)
+IMPLEMENT_CLASS(DVideoModeMenu, false, false, false, false)
 
 
 //=============================================================================
diff --git a/src/p_acs.cpp b/src/p_acs.cpp
index dc646da180..da8f76d7f1 100644
--- a/src/p_acs.cpp
+++ b/src/p_acs.cpp
@@ -1369,7 +1369,7 @@ private:
 	DPlaneWatcher() {}
 };
 
-IMPLEMENT_CLASS(DPlaneWatcher, false, true, false)
+IMPLEMENT_CLASS(DPlaneWatcher, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DPlaneWatcher)
 	IMPLEMENT_POINTER(Activator)
@@ -2860,7 +2860,7 @@ void FBehavior::StaticStopMyScripts (AActor *actor)
 
 //---- The ACS Interpreter ----//
 
-IMPLEMENT_CLASS(DACSThinker, false, true, false)
+IMPLEMENT_CLASS(DACSThinker, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DACSThinker)
 	IMPLEMENT_POINTER(LastScript)
@@ -2991,7 +2991,7 @@ void DACSThinker::StopScriptsFor (AActor *actor)
 	}
 }
 
-IMPLEMENT_CLASS(DLevelScript, false, true, false)
+IMPLEMENT_CLASS(DLevelScript, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DLevelScript)
 	IMPLEMENT_POINTER(next)
diff --git a/src/p_buildmap.cpp b/src/p_buildmap.cpp
index ce2221ca14..b3526c60d5 100644
--- a/src/p_buildmap.cpp
+++ b/src/p_buildmap.cpp
@@ -865,7 +865,7 @@ public:
 	void BeginPlay ();
 };
 
-IMPLEMENT_CLASS(ACustomSprite, false, false, false)
+IMPLEMENT_CLASS(ACustomSprite, false, false, false, false)
 
 void ACustomSprite::BeginPlay ()
 {
diff --git a/src/p_ceiling.cpp b/src/p_ceiling.cpp
index 53100f9caf..d22dd6371d 100644
--- a/src/p_ceiling.cpp
+++ b/src/p_ceiling.cpp
@@ -38,7 +38,7 @@
 //
 //============================================================================
 
-IMPLEMENT_CLASS(DCeiling, false, false, false)
+IMPLEMENT_CLASS(DCeiling, false, false, false, false)
 
 DCeiling::DCeiling ()
 {
diff --git a/src/p_conversation.cpp b/src/p_conversation.cpp
index ad434b535b..5b37268b8d 100644
--- a/src/p_conversation.cpp
+++ b/src/p_conversation.cpp
@@ -1103,7 +1103,7 @@ public:
 
 };
 
-IMPLEMENT_CLASS(DConversationMenu, true, false, false)
+IMPLEMENT_CLASS(DConversationMenu, true, false, false, false)
 int DConversationMenu::mSelection;	// needs to be preserved if the same dialogue is restarted
 
 
diff --git a/src/p_doors.cpp b/src/p_doors.cpp
index 568e880586..542308fa6f 100644
--- a/src/p_doors.cpp
+++ b/src/p_doors.cpp
@@ -45,7 +45,7 @@
 //
 //============================================================================
 
-IMPLEMENT_CLASS(DDoor, false, false, false)
+IMPLEMENT_CLASS(DDoor, false, false, false, false)
 
 DDoor::DDoor ()
 {
@@ -513,7 +513,7 @@ bool EV_DoDoor (DDoor::EVlDoor type, line_t *line, AActor *thing,
 //
 //============================================================================
 
-IMPLEMENT_CLASS(DAnimatedDoor, false, false, false)
+IMPLEMENT_CLASS(DAnimatedDoor, false, false, false, false)
 
 DAnimatedDoor::DAnimatedDoor ()
 {
diff --git a/src/p_floor.cpp b/src/p_floor.cpp
index a89330b2ae..7b5ff5cc93 100644
--- a/src/p_floor.cpp
+++ b/src/p_floor.cpp
@@ -64,7 +64,7 @@ static void StartFloorSound (sector_t *sec)
 //
 //==========================================================================
 
-IMPLEMENT_CLASS(DFloor, false, false, false)
+IMPLEMENT_CLASS(DFloor, false, false, false, false)
 
 DFloor::DFloor ()
 {
@@ -815,7 +815,7 @@ bool EV_DoDonut (int tag, line_t *line, double pillarspeed, double slimespeed)
 //
 //==========================================================================
 
-IMPLEMENT_CLASS(DElevator, false, true, false)
+IMPLEMENT_CLASS(DElevator, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DElevator)
 	IMPLEMENT_POINTER(m_Interp_Floor)
@@ -1105,9 +1105,9 @@ bool EV_DoChange (line_t *line, EChange changetype, int tag)
 //
 //==========================================================================
 
-IMPLEMENT_CLASS(DWaggleBase, false, false, false)
-IMPLEMENT_CLASS(DFloorWaggle, false, false, false)
-IMPLEMENT_CLASS(DCeilingWaggle, false, false, false)
+IMPLEMENT_CLASS(DWaggleBase, false, false, false, false)
+IMPLEMENT_CLASS(DFloorWaggle, false, false, false, false)
+IMPLEMENT_CLASS(DCeilingWaggle, false, false, false, false)
 
 DWaggleBase::DWaggleBase ()
 {
diff --git a/src/p_lights.cpp b/src/p_lights.cpp
index c2c2127a26..c44a22d4b1 100644
--- a/src/p_lights.cpp
+++ b/src/p_lights.cpp
@@ -173,7 +173,7 @@ private:
 //
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(DLighting, false, false, false)
+IMPLEMENT_CLASS(DLighting, false, false, false, false)
 
 DLighting::DLighting ()
 {
@@ -191,7 +191,7 @@ DLighting::DLighting (sector_t *sector)
 //
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(DFireFlicker, false, false, false)
+IMPLEMENT_CLASS(DFireFlicker, false, false, false, false)
 
 DFireFlicker::DFireFlicker ()
 {
@@ -258,7 +258,7 @@ DFireFlicker::DFireFlicker (sector_t *sector, int upper, int lower)
 //
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(DFlicker, false, false, false)
+IMPLEMENT_CLASS(DFlicker, false, false, false, false)
 
 DFlicker::DFlicker ()
 {
@@ -334,7 +334,7 @@ void EV_StartLightFlickering (int tag, int upper, int lower)
 //
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(DLightFlash, false, false, false)
+IMPLEMENT_CLASS(DLightFlash, false, false, false, false)
 
 DLightFlash::DLightFlash ()
 {
@@ -409,7 +409,7 @@ DLightFlash::DLightFlash (sector_t *sector, int min, int max)
 //
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(DStrobe, false, false, false)
+IMPLEMENT_CLASS(DStrobe, false, false, false, false)
 
 DStrobe::DStrobe ()
 {
@@ -667,7 +667,7 @@ void EV_LightChange (int tag, int value)
 //
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(DGlow, false, false, false)
+IMPLEMENT_CLASS(DGlow, false, false, false, false)
 
 DGlow::DGlow ()
 {
@@ -736,7 +736,7 @@ DGlow::DGlow (sector_t *sector)
 //
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(DGlow2, false, false, false)
+IMPLEMENT_CLASS(DGlow2, false, false, false, false)
 
 DGlow2::DGlow2 ()
 {
@@ -869,7 +869,7 @@ void EV_StartLightFading (int tag, int value, int tics)
 //
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(DPhased, false, false, false)
+IMPLEMENT_CLASS(DPhased, false, false, false, false)
 
 DPhased::DPhased ()
 {
diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp
index 3cc961d846..0fb8794cf3 100644
--- a/src/p_mobj.cpp
+++ b/src/p_mobj.cpp
@@ -131,7 +131,7 @@ CVAR (Int, cl_bloodtype, 0, CVAR_ARCHIVE);
 
 // CODE --------------------------------------------------------------------
 
-IMPLEMENT_CLASS(AActor, false, true, true)
+IMPLEMENT_CLASS(AActor, false, true, true, false)
 
 IMPLEMENT_POINTERS_START(AActor)
 	IMPLEMENT_POINTER(target)
@@ -6956,7 +6956,7 @@ DEFINE_ACTION_FUNCTION(AActor, Vec3Offset)
 //
 //----------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(DDropItem, false, true, true)
+IMPLEMENT_CLASS(DDropItem, false, true, true, false)
 
 IMPLEMENT_POINTERS_START(DDropItem)
 	IMPLEMENT_POINTER(Next)
diff --git a/src/p_pillar.cpp b/src/p_pillar.cpp
index fecfbd024d..27eb13ec5b 100644
--- a/src/p_pillar.cpp
+++ b/src/p_pillar.cpp
@@ -40,7 +40,7 @@
 #include "serializer.h"
 #include "r_data/r_interpolate.h"
 
-IMPLEMENT_CLASS(DPillar, false, true, false)
+IMPLEMENT_CLASS(DPillar, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DPillar)
 	IMPLEMENT_POINTER(m_Interp_Floor)
diff --git a/src/p_plats.cpp b/src/p_plats.cpp
index 3bd7089166..9924a0f9ce 100644
--- a/src/p_plats.cpp
+++ b/src/p_plats.cpp
@@ -35,7 +35,7 @@
 
 static FRandom pr_doplat ("DoPlat");
 
-IMPLEMENT_CLASS(DPlat, false, false, false)
+IMPLEMENT_CLASS(DPlat, false, false, false, false)
 
 DPlat::DPlat ()
 {
diff --git a/src/p_pspr.cpp b/src/p_pspr.cpp
index b64bb22a74..d279a180cc 100644
--- a/src/p_pspr.cpp
+++ b/src/p_pspr.cpp
@@ -99,7 +99,7 @@ static const FGenericButtons ButtonChecks[] =
 //
 //------------------------------------------------------------------------
 
-IMPLEMENT_CLASS(DPSprite, false, true, false)
+IMPLEMENT_CLASS(DPSprite, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DPSprite)
 	IMPLEMENT_POINTER(Caller)
diff --git a/src/p_pusher.cpp b/src/p_pusher.cpp
index 250e8ee3de..f2f982a7fa 100644
--- a/src/p_pusher.cpp
+++ b/src/p_pusher.cpp
@@ -74,7 +74,7 @@ protected:
 	friend bool PIT_PushThing (AActor *thing);
 };
 
-IMPLEMENT_CLASS(DPusher, false, true, false)
+IMPLEMENT_CLASS(DPusher, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DPusher)
 	IMPLEMENT_POINTER(m_Source)
diff --git a/src/p_scroll.cpp b/src/p_scroll.cpp
index 67f6499d61..f44eac25a9 100644
--- a/src/p_scroll.cpp
+++ b/src/p_scroll.cpp
@@ -73,7 +73,7 @@ private:
 	}
 };
 
-IMPLEMENT_CLASS(DScroller, false, true, false)
+IMPLEMENT_CLASS(DScroller, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DScroller)
 	IMPLEMENT_POINTER(m_Interpolations[0])
diff --git a/src/p_spec.cpp b/src/p_spec.cpp
index e9ac494197..e687d5724f 100644
--- a/src/p_spec.cpp
+++ b/src/p_spec.cpp
@@ -660,7 +660,7 @@ protected:
 	short LastLight;
 };
 
-IMPLEMENT_CLASS(DLightTransfer, false, false, false)
+IMPLEMENT_CLASS(DLightTransfer, false, false, false, false)
 
 void DLightTransfer::Serialize(FSerializer &arc)
 {
@@ -750,7 +750,7 @@ protected:
 	BYTE Flags;
 };
 
-IMPLEMENT_CLASS(DWallLightTransfer, false, false, false)
+IMPLEMENT_CLASS(DWallLightTransfer, false, false, false, false)
 
 void DWallLightTransfer::Serialize(FSerializer &arc)
 {
diff --git a/src/p_switch.cpp b/src/p_switch.cpp
index 027b5d99d2..2d5423f084 100644
--- a/src/p_switch.cpp
+++ b/src/p_switch.cpp
@@ -320,7 +320,7 @@ bool P_ChangeSwitchTexture (side_t *side, int useAgain, BYTE special, bool *ques
 //
 //==========================================================================
 
-IMPLEMENT_CLASS(DActiveButton, false, false, false)
+IMPLEMENT_CLASS(DActiveButton, false, false, false, false)
 
 DActiveButton::DActiveButton ()
 {
diff --git a/src/p_teleport.cpp b/src/p_teleport.cpp
index 85ee8a1c83..01595ff659 100644
--- a/src/p_teleport.cpp
+++ b/src/p_teleport.cpp
@@ -47,7 +47,7 @@ extern void P_CalcHeight (player_t *player);
 
 CVAR (Bool, telezoom, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG);
 
-IMPLEMENT_CLASS(ATeleportFog, false, false, false)
+IMPLEMENT_CLASS(ATeleportFog, false, false, false, false)
 
 void ATeleportFog::PostBeginPlay ()
 {
diff --git a/src/p_user.cpp b/src/p_user.cpp
index 266d216bb0..0b7d9c3545 100644
--- a/src/p_user.cpp
+++ b/src/p_user.cpp
@@ -508,7 +508,7 @@ int player_t::GetSpawnClass()
 //
 //===========================================================================
 
-IMPLEMENT_CLASS(PClassPlayerPawn, false, false, false)
+IMPLEMENT_CLASS(PClassPlayerPawn, false, false, false, false)
 
 PClassPlayerPawn::PClassPlayerPawn()
 {
@@ -622,14 +622,14 @@ void player_t::SendPitchLimits() const
 //
 //===========================================================================
 
-IMPLEMENT_CLASS(APlayerPawn, false, true, false)
+IMPLEMENT_CLASS(APlayerPawn, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(APlayerPawn)
 	IMPLEMENT_POINTER(InvFirst)
 	IMPLEMENT_POINTER(InvSel)
 IMPLEMENT_POINTERS_END
 
-IMPLEMENT_CLASS(APlayerChunk, false, false, false)
+IMPLEMENT_CLASS(APlayerChunk, false, false, false, false)
 
 void APlayerPawn::Serialize(FSerializer &arc)
 {
diff --git a/src/po_man.cpp b/src/po_man.cpp
index 3261e34f32..4e304daa8b 100644
--- a/src/po_man.cpp
+++ b/src/po_man.cpp
@@ -172,7 +172,7 @@ static FPolyNode *FreePolyNodes;
 //
 //==========================================================================
 
-IMPLEMENT_CLASS(DPolyAction, false, true, false)
+IMPLEMENT_CLASS(DPolyAction, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DPolyAction)
 	IMPLEMENT_POINTER(m_Interpolation)
@@ -240,7 +240,7 @@ void DPolyAction::StopInterpolation ()
 //
 //==========================================================================
 
-IMPLEMENT_CLASS(DRotatePoly, false, false, false)
+IMPLEMENT_CLASS(DRotatePoly, false, false, false, false)
 
 DRotatePoly::DRotatePoly ()
 {
@@ -257,7 +257,7 @@ DRotatePoly::DRotatePoly (int polyNum)
 //
 //==========================================================================
 
-IMPLEMENT_CLASS(DMovePoly, false, false, false)
+IMPLEMENT_CLASS(DMovePoly, false, false, false, false)
 
 DMovePoly::DMovePoly ()
 {
@@ -284,7 +284,7 @@ DMovePoly::DMovePoly (int polyNum)
 //
 //==========================================================================
 
-IMPLEMENT_CLASS(DMovePolyTo, false, false, false)
+IMPLEMENT_CLASS(DMovePolyTo, false, false, false, false)
 
 DMovePolyTo::DMovePolyTo()
 {
@@ -309,7 +309,7 @@ DMovePolyTo::DMovePolyTo(int polyNum)
 //
 //==========================================================================
 
-IMPLEMENT_CLASS(DPolyDoor, false, false, false)
+IMPLEMENT_CLASS(DPolyDoor, false, false, false, false)
 
 DPolyDoor::DPolyDoor ()
 {
diff --git a/src/posix/sdl/sdlvideo.cpp b/src/posix/sdl/sdlvideo.cpp
index 29b7415616..a1e6056ca7 100644
--- a/src/posix/sdl/sdlvideo.cpp
+++ b/src/posix/sdl/sdlvideo.cpp
@@ -79,7 +79,7 @@ private:
 	SDLFB () {}
 };
 
-IMPLEMENT_CLASS(SDLFB, false, false, false)
+IMPLEMENT_CLASS(SDLFB, false, false, false, false)
 
 struct MiniModeInfo
 {
diff --git a/src/r_data/r_interpolate.cpp b/src/r_data/r_interpolate.cpp
index 911127f07b..c98adb47b7 100644
--- a/src/r_data/r_interpolate.cpp
+++ b/src/r_data/r_interpolate.cpp
@@ -161,17 +161,17 @@ public:
 //
 //==========================================================================
 
-IMPLEMENT_CLASS(DInterpolation, true, true, false)
+IMPLEMENT_CLASS(DInterpolation, true, true, false, false)
 
 IMPLEMENT_POINTERS_START(DInterpolation)
 	IMPLEMENT_POINTER(Next)
 	IMPLEMENT_POINTER(Prev)
 IMPLEMENT_POINTERS_END
 
-IMPLEMENT_CLASS(DSectorPlaneInterpolation, false, false, false)
-IMPLEMENT_CLASS(DSectorScrollInterpolation, false, false, false)
-IMPLEMENT_CLASS(DWallScrollInterpolation, false, false, false)
-IMPLEMENT_CLASS(DPolyobjInterpolation, false, false, false)
+IMPLEMENT_CLASS(DSectorPlaneInterpolation, false, false, false, false)
+IMPLEMENT_CLASS(DSectorScrollInterpolation, false, false, false, false)
+IMPLEMENT_CLASS(DWallScrollInterpolation, false, false, false, false)
+IMPLEMENT_CLASS(DPolyobjInterpolation, false, false, false, false)
 
 //==========================================================================
 //
diff --git a/src/s_advsound.cpp b/src/s_advsound.cpp
index 1aedcb1fb1..c68df5f3c8 100644
--- a/src/s_advsound.cpp
+++ b/src/s_advsound.cpp
@@ -2213,7 +2213,7 @@ private:
 	int NextCheck;
 };
 
-IMPLEMENT_CLASS(AAmbientSound, false, false, false)
+IMPLEMENT_CLASS(AAmbientSound, false, false, false, false)
 
 //==========================================================================
 //
@@ -2470,7 +2470,7 @@ public:
 	virtual void PostBeginPlay();
 };
 
-IMPLEMENT_CLASS(AMusicChanger, false, false, false)
+IMPLEMENT_CLASS(AMusicChanger, false, false, false, false)
 
 bool AMusicChanger::DoTriggerAction (AActor *triggerer, int activationType)
 {
diff --git a/src/s_sndseq.cpp b/src/s_sndseq.cpp
index 449baa4d6b..1bed35ed5b 100644
--- a/src/s_sndseq.cpp
+++ b/src/s_sndseq.cpp
@@ -285,7 +285,7 @@ void DSeqNode::SerializeSequences (FSerializer &arc)
 	arc("sndseqlisthead", SequenceListHead);
 }
 
-IMPLEMENT_CLASS(DSeqNode, false, true, false)
+IMPLEMENT_CLASS(DSeqNode, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DSeqNode)
 	IMPLEMENT_POINTER(m_ChildSeqNode)
@@ -429,7 +429,7 @@ FName DSeqNode::GetSequenceName () const
 	return Sequences[m_Sequence]->SeqName;
 }
 
-IMPLEMENT_CLASS(DSeqActorNode, false, true, false)
+IMPLEMENT_CLASS(DSeqActorNode, false, true, false, false)
 
 IMPLEMENT_POINTERS_START(DSeqActorNode)
 	IMPLEMENT_POINTER(m_Actor)
@@ -441,7 +441,7 @@ void DSeqActorNode::Serialize(FSerializer &arc)
 	arc("actor", m_Actor);
 }
 
-IMPLEMENT_CLASS(DSeqPolyNode, false, false, false)
+IMPLEMENT_CLASS(DSeqPolyNode, false, false, false, false)
 
 void DSeqPolyNode::Serialize(FSerializer &arc)
 {
@@ -449,7 +449,7 @@ void DSeqPolyNode::Serialize(FSerializer &arc)
 	arc("poly", m_Poly);
 }
 
-IMPLEMENT_CLASS(DSeqSectorNode, false, false, false)
+IMPLEMENT_CLASS(DSeqSectorNode, false, false, false, false)
 
 void DSeqSectorNode::Serialize(FSerializer &arc)
 {
diff --git a/src/scripting/decorate/olddecorations.cpp b/src/scripting/decorate/olddecorations.cpp
index 63ae447cfd..d1b79328f9 100644
--- a/src/scripting/decorate/olddecorations.cpp
+++ b/src/scripting/decorate/olddecorations.cpp
@@ -96,7 +96,7 @@ public:
 	}
 };
 
-IMPLEMENT_CLASS(AFakeInventory, false, false, false)
+IMPLEMENT_CLASS(AFakeInventory, false, false, false, false)
 
 // PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
 
diff --git a/src/scripting/vm/vmframe.cpp b/src/scripting/vm/vmframe.cpp
index 3070c1b4d7..3a593861c1 100644
--- a/src/scripting/vm/vmframe.cpp
+++ b/src/scripting/vm/vmframe.cpp
@@ -34,15 +34,15 @@
 #include <new>
 #include "vm.h"
 
-IMPLEMENT_CLASS(VMException, false, false, false)
-IMPLEMENT_CLASS(VMFunction, true, true, false)
+IMPLEMENT_CLASS(VMException, false, false, false, false)
+IMPLEMENT_CLASS(VMFunction, true, true, false, false)
 
 IMPLEMENT_POINTERS_START(VMFunction)
 	IMPLEMENT_POINTER(Proto)
 IMPLEMENT_POINTERS_END
 
-IMPLEMENT_CLASS(VMScriptFunction, false, false, false)
-IMPLEMENT_CLASS(VMNativeFunction, false, false, false)
+IMPLEMENT_CLASS(VMScriptFunction, false, false, false, false)
+IMPLEMENT_CLASS(VMNativeFunction, false, false, false, false)
 
 VMScriptFunction::VMScriptFunction(FName name)
 {
diff --git a/src/v_video.cpp b/src/v_video.cpp
index f79f31b1c7..e3954385a8 100644
--- a/src/v_video.cpp
+++ b/src/v_video.cpp
@@ -69,8 +69,8 @@ int active_con_scale();
 
 FRenderer *Renderer;
 
-IMPLEMENT_CLASS(DCanvas, true, false, false)
-IMPLEMENT_CLASS(DFrameBuffer, true, false, false)
+IMPLEMENT_CLASS(DCanvas, true, false, false, false)
+IMPLEMENT_CLASS(DFrameBuffer, true, false, false, false)
 
 #if defined(_DEBUG) && defined(_M_IX86)
 #define DBGBREAK	{ __asm int 3 }
@@ -106,11 +106,11 @@ public:
 
 	float Gamma;
 };
-IMPLEMENT_CLASS(DDummyFrameBuffer, true, false, false)
+IMPLEMENT_CLASS(DDummyFrameBuffer, true, false, false, false)
 
 // SimpleCanvas is not really abstract, but this macro does not
 // try to generate a CreateNew() function.
-IMPLEMENT_CLASS(DSimpleCanvas, true, false, false)
+IMPLEMENT_CLASS(DSimpleCanvas, true, false, false, false)
 
 class FPaletteTester : public FTexture
 {
diff --git a/src/win32/fb_d3d9.cpp b/src/win32/fb_d3d9.cpp
index a79ef1a3f3..6d162bbec0 100644
--- a/src/win32/fb_d3d9.cpp
+++ b/src/win32/fb_d3d9.cpp
@@ -91,7 +91,7 @@
 
 // TYPES -------------------------------------------------------------------
 
-IMPLEMENT_CLASS(D3DFB, false, false, false)
+IMPLEMENT_CLASS(D3DFB, false, false, false, false)
 
 struct D3DFB::PackedTexture
 {
diff --git a/src/win32/fb_ddraw.cpp b/src/win32/fb_ddraw.cpp
index dcd6d37a95..bd5a4db230 100644
--- a/src/win32/fb_ddraw.cpp
+++ b/src/win32/fb_ddraw.cpp
@@ -61,7 +61,7 @@
 
 // TYPES -------------------------------------------------------------------
 
-IMPLEMENT_CLASS(DDrawFB, false, false, false)
+IMPLEMENT_CLASS(DDrawFB, false, false, false, false)
 
 // EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
 
diff --git a/src/win32/win32video.cpp b/src/win32/win32video.cpp
index b8aded5c1b..d7c5d5bf5b 100644
--- a/src/win32/win32video.cpp
+++ b/src/win32/win32video.cpp
@@ -78,7 +78,7 @@
 
 // TYPES -------------------------------------------------------------------
 
-IMPLEMENT_CLASS(BaseWinFB, true, false, false)
+IMPLEMENT_CLASS(BaseWinFB, true, false, false, false)
 
 typedef IDirect3D9 *(WINAPI *DIRECT3DCREATE9FUNC)(UINT SDKVersion);
 typedef HRESULT (WINAPI *DIRECTDRAWCREATEFUNC)(GUID FAR *lpGUID, LPDIRECTDRAW FAR *lplpDD, IUnknown FAR *pUnkOuter);