Add the new argument to all uses of the implement macro

This commit is contained in:
Leonard2 2016-11-06 19:43:19 +01:00
parent 33e2c74642
commit 7dbc4710f1
125 changed files with 346 additions and 346 deletions

View file

@ -15,7 +15,7 @@
#include "serializer.h" #include "serializer.h"
#include "d_player.h" #include "d_player.h"
IMPLEMENT_CLASS(DBot, false, true, false) IMPLEMENT_CLASS(DBot, false, true, false, false)
IMPLEMENT_POINTERS_START(DBot) IMPLEMENT_POINTERS_START(DBot)
IMPLEMENT_POINTER(dest) IMPLEMENT_POINTER(dest)

View file

@ -187,7 +187,7 @@ static const char *KeyConfCommands[] =
// CODE -------------------------------------------------------------------- // CODE --------------------------------------------------------------------
IMPLEMENT_CLASS(DWaitingCommand, false, false, false) IMPLEMENT_CLASS(DWaitingCommand, false, false, false, false)
void DWaitingCommand::Serialize(FSerializer &arc) 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 () DStoredCommand::DStoredCommand ()
{ {

View file

@ -231,7 +231,7 @@ DehInfo deh =
// from the original actor's defaults. The original actor is then changed to // from the original actor's defaults. The original actor is then changed to
// spawn the new class. // spawn the new class.
IMPLEMENT_CLASS(ADehackedPickup, false, true, false) IMPLEMENT_CLASS(ADehackedPickup, false, true, false, false)
IMPLEMENT_POINTERS_START(ADehackedPickup) IMPLEMENT_POINTERS_START(ADehackedPickup)
IMPLEMENT_POINTER(RealPickup) IMPLEMENT_POINTER(RealPickup)

View file

@ -119,7 +119,7 @@ protected:
DDecalThinker () : DThinker (STAT_DECALTHINKER) {} DDecalThinker () : DThinker (STAT_DECALTHINKER) {}
}; };
IMPLEMENT_CLASS(DDecalThinker, false, true, false) IMPLEMENT_CLASS(DDecalThinker, false, true, false, false)
IMPLEMENT_POINTERS_START(DDecalThinker) IMPLEMENT_POINTERS_START(DDecalThinker)
IMPLEMENT_POINTER(TheDecal) 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) void DDecalFader::Serialize(FSerializer &arc)
{ {
@ -1202,7 +1202,7 @@ DThinker *FDecalFaderAnim::CreateThinker (DBaseDecal *actor, side_t *wall) const
return fader; return fader;
} }
IMPLEMENT_CLASS(DDecalStretcher, false, false, false) IMPLEMENT_CLASS(DDecalStretcher, false, false, false, false)
void DDecalStretcher::Serialize(FSerializer &arc) 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) void DDecalSlider::Serialize(FSerializer &arc)
{ {
@ -1370,7 +1370,7 @@ FDecalAnimator *FDecalLib::FindAnimator (const char *name)
return NULL; return NULL;
} }
IMPLEMENT_CLASS(DDecalColorer, false, false, false) IMPLEMENT_CLASS(DDecalColorer, false, false, false, false)
void DDecalColorer::Serialize(FSerializer &arc) void DDecalColorer::Serialize(FSerializer &arc)
{ {

View file

@ -126,7 +126,7 @@ public:
int SideNum; int SideNum;
}; };
IMPLEMENT_CLASS(DSectorMarker, false, false, false) IMPLEMENT_CLASS(DSectorMarker, false, false, false, false)
// EXTERNAL FUNCTION PROTOTYPES -------------------------------------------- // EXTERNAL FUNCTION PROTOTYPES --------------------------------------------

View file

@ -93,8 +93,8 @@ static const size_t TheEnd = ~(size_t)0;
// CODE -------------------------------------------------------------------- // CODE --------------------------------------------------------------------
IMPLEMENT_CLASS(PErrorType, false, false, false) IMPLEMENT_CLASS(PErrorType, false, false, false, false)
IMPLEMENT_CLASS(PVoidType, false, false, false) IMPLEMENT_CLASS(PVoidType, false, false, false, false)
void DumpTypeTable() void DumpTypeTable()
{ {
@ -141,7 +141,7 @@ void DumpTypeTable()
/* PClassType *************************************************************/ /* PClassType *************************************************************/
IMPLEMENT_CLASS(PClassType, false, false, false) IMPLEMENT_CLASS(PClassType, false, false, false, false)
//========================================================================== //==========================================================================
// //
@ -169,7 +169,7 @@ void PClassType::Derive(PClass *newclass)
/* PClassClass ************************************************************/ /* PClassClass ************************************************************/
IMPLEMENT_CLASS(PClassClass, false, false, false) IMPLEMENT_CLASS(PClassClass, false, false, false, false)
//========================================================================== //==========================================================================
// //
@ -187,7 +187,7 @@ PClassClass::PClassClass()
/* PType ******************************************************************/ /* PType ******************************************************************/
IMPLEMENT_CLASS(PType, true, true, false) IMPLEMENT_CLASS(PType, true, true, false, false)
IMPLEMENT_POINTERS_START(PType) IMPLEMENT_POINTERS_START(PType)
IMPLEMENT_POINTER(HashNext) IMPLEMENT_POINTER(HashNext)
@ -614,7 +614,7 @@ void PType::StaticInit()
/* PBasicType *************************************************************/ /* 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 **********************************************************/ /* PCompoundType **********************************************************/
IMPLEMENT_CLASS(PCompoundType, true, false, false) IMPLEMENT_CLASS(PCompoundType, true, false, false, false)
/* PNamedType *************************************************************/ /* PNamedType *************************************************************/
IMPLEMENT_CLASS(PNamedType, true, true, false) IMPLEMENT_CLASS(PNamedType, true, true, false, false)
IMPLEMENT_POINTERS_START(PNamedType) IMPLEMENT_POINTERS_START(PNamedType)
IMPLEMENT_POINTER(Outer) IMPLEMENT_POINTER(Outer)
@ -692,7 +692,7 @@ FString PNamedType::QualifiedName() const
/* PInt *******************************************************************/ /* 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 ******************************************************************/ /* PBool ******************************************************************/
IMPLEMENT_CLASS(PBool, false, false, false) IMPLEMENT_CLASS(PBool, false, false, false, false)
//========================================================================== //==========================================================================
// //
@ -952,7 +952,7 @@ PBool::PBool()
/* PFloat *****************************************************************/ /* PFloat *****************************************************************/
IMPLEMENT_CLASS(PFloat, false, false, false) IMPLEMENT_CLASS(PFloat, false, false, false, false)
//========================================================================== //==========================================================================
// //
@ -1202,7 +1202,7 @@ void PFloat::SetOps()
/* PString ****************************************************************/ /* 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 ******************************************************************/ /* 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 *****************************************************************/ /* 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 *****************************************************************/ /* PColor *****************************************************************/
IMPLEMENT_CLASS(PColor, false, false, false) IMPLEMENT_CLASS(PColor, false, false, false, false)
//========================================================================== //==========================================================================
// //
@ -1416,7 +1416,7 @@ PColor::PColor()
/* PStatePointer **********************************************************/ /* 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 ***************************************************************/ /* PPointer ***************************************************************/
IMPLEMENT_CLASS(PPointer, false, true, false) IMPLEMENT_CLASS(PPointer, false, true, false, false)
IMPLEMENT_POINTERS_START(PPointer) IMPLEMENT_POINTERS_START(PPointer)
IMPLEMENT_POINTER(PointedType) IMPLEMENT_POINTER(PointedType)
@ -1591,7 +1591,7 @@ PPointer *NewPointer(PType *type, bool isconst)
/* PClassPointer **********************************************************/ /* PClassPointer **********************************************************/
IMPLEMENT_CLASS(PClassPointer, false, true, false) IMPLEMENT_CLASS(PClassPointer, false, true, false, false)
IMPLEMENT_POINTERS_START(PClassPointer) IMPLEMENT_POINTERS_START(PClassPointer)
IMPLEMENT_POINTER(ClassRestriction) IMPLEMENT_POINTER(ClassRestriction)
@ -1672,7 +1672,7 @@ PClassPointer *NewClassPointer(PClass *restrict)
/* PEnum ******************************************************************/ /* PEnum ******************************************************************/
IMPLEMENT_CLASS(PEnum, false, true, false) IMPLEMENT_CLASS(PEnum, false, true, false, false)
IMPLEMENT_POINTERS_START(PEnum) IMPLEMENT_POINTERS_START(PEnum)
IMPLEMENT_POINTER(ValueType) IMPLEMENT_POINTER(ValueType)
@ -1725,7 +1725,7 @@ PEnum *NewEnum(FName name, PTypeBase *outer)
/* PArray *****************************************************************/ /* PArray *****************************************************************/
IMPLEMENT_CLASS(PArray, false, true, false) IMPLEMENT_CLASS(PArray, false, true, false, false)
IMPLEMENT_POINTERS_START(PArray) IMPLEMENT_POINTERS_START(PArray)
IMPLEMENT_POINTER(ElementType) IMPLEMENT_POINTER(ElementType)
@ -1874,7 +1874,7 @@ PArray *NewArray(PType *type, unsigned int count)
/* PVector ****************************************************************/ /* PVector ****************************************************************/
IMPLEMENT_CLASS(PVector, false, false, false) IMPLEMENT_CLASS(PVector, false, false, false, false)
//========================================================================== //==========================================================================
// //
@ -1924,7 +1924,7 @@ PVector *NewVector(unsigned int size)
/* PDynArray **************************************************************/ /* PDynArray **************************************************************/
IMPLEMENT_CLASS(PDynArray, false, true, false) IMPLEMENT_CLASS(PDynArray, false, true, false, false)
IMPLEMENT_POINTERS_START(PDynArray) IMPLEMENT_POINTERS_START(PDynArray)
IMPLEMENT_POINTER(ElementType) IMPLEMENT_POINTER(ElementType)
@ -2007,7 +2007,7 @@ PDynArray *NewDynArray(PType *type)
/* PMap *******************************************************************/ /* PMap *******************************************************************/
IMPLEMENT_CLASS(PMap, false, true, false) IMPLEMENT_CLASS(PMap, false, true, false, false)
IMPLEMENT_POINTERS_START(PMap) IMPLEMENT_POINTERS_START(PMap)
IMPLEMENT_POINTER(KeyType) IMPLEMENT_POINTER(KeyType)
@ -2091,7 +2091,7 @@ PMap *NewMap(PType *keytype, PType *valuetype)
/* PStruct ****************************************************************/ /* 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 *****************************************************************/ /* 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 *************************************************************/ /* 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 **************************************************************/ /* 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 *****************************************************************/ /* PClass *****************************************************************/
IMPLEMENT_CLASS(PClass, false, true, false) IMPLEMENT_CLASS(PClass, false, true, false, false)
IMPLEMENT_POINTERS_START(PClass) IMPLEMENT_POINTERS_START(PClass)
IMPLEMENT_POINTER(ParentClass) IMPLEMENT_POINTER(ParentClass)
@ -3424,19 +3424,19 @@ CCMD(typetable)
// Symbol tables ------------------------------------------------------------ // Symbol tables ------------------------------------------------------------
IMPLEMENT_CLASS(PTypeBase, true, false, false); IMPLEMENT_CLASS(PTypeBase, true, false, false, false);
IMPLEMENT_CLASS(PSymbol, true, false, false); IMPLEMENT_CLASS(PSymbol, true, false, false, false);
IMPLEMENT_CLASS(PSymbolConst, false, false, false); IMPLEMENT_CLASS(PSymbolConst, false, false, false, false);
IMPLEMENT_CLASS(PSymbolConstNumeric, false, false, false); IMPLEMENT_CLASS(PSymbolConstNumeric, false, false, false, false);
IMPLEMENT_CLASS(PSymbolConstString, false, false, false); IMPLEMENT_CLASS(PSymbolConstString, false, false, false, false);
IMPLEMENT_CLASS(PSymbolTreeNode, false, false, false) IMPLEMENT_CLASS(PSymbolTreeNode, false, false, false, false)
IMPLEMENT_CLASS(PSymbolType, false, true, false) IMPLEMENT_CLASS(PSymbolType, false, true, false, false)
IMPLEMENT_POINTERS_START(PSymbolType) IMPLEMENT_POINTERS_START(PSymbolType)
IMPLEMENT_POINTER(Type) IMPLEMENT_POINTER(Type)
IMPLEMENT_POINTERS_END IMPLEMENT_POINTERS_END
IMPLEMENT_CLASS(PSymbolVMFunction, false, true, false) IMPLEMENT_CLASS(PSymbolVMFunction, false, true, false, false)
IMPLEMENT_POINTERS_START(PSymbolVMFunction) IMPLEMENT_POINTERS_START(PSymbolVMFunction)
IMPLEMENT_POINTER(Function) IMPLEMENT_POINTER(Function)

View file

@ -31,7 +31,7 @@
#include "serializer.h" #include "serializer.h"
#include "doomstat.h" #include "doomstat.h"
IMPLEMENT_CLASS(DSectorEffect, false, false, false) IMPLEMENT_CLASS(DSectorEffect, false, false, false, false)
DSectorEffect::DSectorEffect () DSectorEffect::DSectorEffect ()
: DThinker(STAT_SECTOREFFECT) : DThinker(STAT_SECTOREFFECT)
@ -71,7 +71,7 @@ void DSectorEffect::Serialize(FSerializer &arc)
arc("sector", m_Sector); arc("sector", m_Sector);
} }
IMPLEMENT_CLASS(DMover, false, true, false) IMPLEMENT_CLASS(DMover, false, true, false, false)
IMPLEMENT_POINTERS_START(DMover) IMPLEMENT_POINTERS_START(DMover)
IMPLEMENT_POINTER(interpolation) 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 () DMovingFloor::DMovingFloor ()
{ {
@ -121,7 +121,7 @@ DMovingFloor::DMovingFloor (sector_t *sector)
interpolation = sector->SetInterpolation(sector_t::FloorMove, true); interpolation = sector->SetInterpolation(sector_t::FloorMove, true);
} }
IMPLEMENT_CLASS(DMovingCeiling, false, false, false) IMPLEMENT_CLASS(DMovingCeiling, false, false, false, false)
DMovingCeiling::DMovingCeiling () DMovingCeiling::DMovingCeiling ()
{ {

View file

@ -47,7 +47,7 @@ extern cycle_t BotSupportCycles;
extern cycle_t ActionCycles; extern cycle_t ActionCycles;
extern int BotWTG; extern int BotWTG;
IMPLEMENT_CLASS(DThinker, false, false, false) IMPLEMENT_CLASS(DThinker, false, false, false, false)
DThinker *NextToThink; 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) DEFINE_ACTION_FUNCTION(DThinkerIterator, Create)
{ {
PARAM_PROLOGUE; PARAM_PROLOGUE;

View file

@ -1785,7 +1785,7 @@ public:
void Destroy() { Super::Destroy(); m_Sector->lightingdata=NULL; } 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) void DLightLevel::Serialize(FSerializer &arc)
{ {

View file

@ -71,7 +71,7 @@
// //
//========================================================================== //==========================================================================
IMPLEMENT_CLASS(DFsSection, false, true, false) IMPLEMENT_CLASS(DFsSection, false, true, false, false)
IMPLEMENT_POINTERS_START(DFsSection) IMPLEMENT_POINTERS_START(DFsSection)
IMPLEMENT_POINTER(next) IMPLEMENT_POINTER(next)

View file

@ -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_POINTERS_START(DFsScript)
IMPLEMENT_POINTER(parent) 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_POINTERS_START(DRunningScript)
IMPLEMENT_POINTER(prev) 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_POINTERS_START(DFraggleThinker)
IMPLEMENT_POINTER(RunningScripts) IMPLEMENT_POINTER(RunningScripts)

View file

@ -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_POINTERS_START(DFsVariable)
IMPLEMENT_POINTER(next) IMPLEMENT_POINTER(next)

View file

@ -19,7 +19,7 @@ static FRandom pr_m_gunshot ("SMarineGunshot");
static FRandom pr_m_saw ("SMarineSaw"); static FRandom pr_m_saw ("SMarineSaw");
static FRandom pr_m_fireshotgun2 ("SMarineFireSSG"); static FRandom pr_m_fireshotgun2 ("SMarineFireSSG");
IMPLEMENT_CLASS(AScriptedMarine, false, false, false) IMPLEMENT_CLASS(AScriptedMarine, false, false, false, false)
void AScriptedMarine::Serialize(FSerializer &arc) void AScriptedMarine::Serialize(FSerializer &arc)
{ {

View file

@ -29,7 +29,7 @@ public:
void MorphPlayerThink (); void MorphPlayerThink ();
}; };
IMPLEMENT_CLASS(AChickenPlayer, false, false, false) IMPLEMENT_CLASS(AChickenPlayer, false, false, false, false)
void AChickenPlayer::MorphPlayerThink () void AChickenPlayer::MorphPlayerThink ()
{ {

View file

@ -17,7 +17,7 @@ public:
bool Use (bool pickup); bool Use (bool pickup);
}; };
IMPLEMENT_CLASS(AArtiTomeOfPower, false, false, false) IMPLEMENT_CLASS(AArtiTomeOfPower, false, false, false, false)
bool AArtiTomeOfPower::Use (bool pickup) bool AArtiTomeOfPower::Use (bool pickup)
{ {
@ -63,7 +63,7 @@ public:
bool Use (bool pickup); bool Use (bool pickup);
}; };
IMPLEMENT_CLASS(AArtiTimeBomb, false, false, false) IMPLEMENT_CLASS(AArtiTimeBomb, false, false, false, false)
bool AArtiTimeBomb::Use (bool pickup) bool AArtiTimeBomb::Use (bool pickup)
{ {

View file

@ -358,7 +358,7 @@ public:
int DoSpecialDamage (AActor *target, int damage, FName damagetype); 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) 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 ------------------------------------------------------------------- // Ripper -------------------------------------------------------------------
@ -738,7 +738,7 @@ public:
int DoSpecialDamage (AActor *target, int damage, FName damagetype); 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) int ARipper::DoSpecialDamage (AActor *target, int damage, FName damagetype)
{ {
@ -828,7 +828,7 @@ public:
int DoSpecialDamage (AActor *target, int damage, FName damagetype); 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) int AHornRodFX2::DoSpecialDamage (AActor *target, int damage, FName damagetype)
{ {
@ -849,7 +849,7 @@ public:
int DoSpecialDamage (AActor *target, int damage, FName damagetype); 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) int ARainPillar::DoSpecialDamage (AActor *target, int damage, FName damagetype)
{ {
@ -871,7 +871,7 @@ public:
TObjPtr<AActor> Rain1, Rain2; TObjPtr<AActor> Rain1, Rain2;
}; };
IMPLEMENT_CLASS(ARainTracker, false, false, false) IMPLEMENT_CLASS(ARainTracker, false, false, false, false)
void ARainTracker::Serialize(FSerializer &arc) void ARainTracker::Serialize(FSerializer &arc)
{ {
@ -1158,8 +1158,8 @@ public:
void EndPowerup (); void EndPowerup ();
}; };
IMPLEMENT_CLASS(APhoenixRod, false, false, false) IMPLEMENT_CLASS(APhoenixRod, false, false, false, false)
IMPLEMENT_CLASS(APhoenixRodPowered, false, false, false) IMPLEMENT_CLASS(APhoenixRodPowered, false, false, false, false)
void APhoenixRodPowered::EndPowerup () void APhoenixRodPowered::EndPowerup ()
{ {
@ -1177,7 +1177,7 @@ public:
int DoSpecialDamage (AActor *target, int damage, FName damagetype); 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) int APhoenixFX1::DoSpecialDamage (AActor *target, int damage, FName damagetype)
{ {
@ -1198,7 +1198,7 @@ public:
int DoSpecialDamage (AActor *target, int damage, FName damagetype); 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) int APhoenixFX2::DoSpecialDamage (AActor *target, int damage, FName damagetype)
{ {

View file

@ -22,7 +22,7 @@ public:
int DoSpecialDamage (AActor *target, int damage, FName damagetype); 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) int AWhirlwind::DoSpecialDamage (AActor *target, int damage, FName damagetype)
{ {

View file

@ -17,7 +17,7 @@ public:
bool Use (bool pickup); bool Use (bool pickup);
}; };
IMPLEMENT_CLASS(AArtiBoostArmor, false, false, false) IMPLEMENT_CLASS(AArtiBoostArmor, false, false, false, false)
bool AArtiBoostArmor::Use (bool pickup) bool AArtiBoostArmor::Use (bool pickup)
{ {

View file

@ -33,7 +33,7 @@ public:
void Effect (); void Effect ();
}; };
IMPLEMENT_CLASS(ACFlameMissile, false, false, false) IMPLEMENT_CLASS(ACFlameMissile, false, false, false, false)
void ACFlameMissile::BeginPlay () void ACFlameMissile::BeginPlay ()
{ {

View file

@ -58,11 +58,11 @@ public:
BYTE CHolyCount; BYTE CHolyCount;
}; };
IMPLEMENT_CLASS(ACWeapWraithverge, false, false, false) IMPLEMENT_CLASS(ACWeapWraithverge, false, false, false, false)
// Holy Spirit -------------------------------------------------------------- // Holy Spirit --------------------------------------------------------------
IMPLEMENT_CLASS(AHolySpirit, false, false, false) IMPLEMENT_CLASS(AHolySpirit, false, false, false, false)
bool AHolySpirit::Slam(AActor *thing) bool AHolySpirit::Slam(AActor *thing)
{ {

View file

@ -25,7 +25,7 @@ public:
int DoSpecialDamage (AActor *target, int damage, FName damagetype); 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) int ACStaffMissile::DoSpecialDamage (AActor *target, int damage, FName damagetype)
{ {

View file

@ -38,7 +38,7 @@ public:
FState *GetAtkState (bool hold); FState *GetAtkState (bool hold);
}; };
IMPLEMENT_CLASS(AFWeapAxe, false, false, false) IMPLEMENT_CLASS(AFWeapAxe, false, false, false, false)
FState *AFWeapAxe::GetUpState () FState *AFWeapAxe::GetUpState ()
{ {

View file

@ -11,9 +11,9 @@
#include "vm.h" #include "vm.h"
*/ */
IMPLEMENT_CLASS(AFighterWeapon, false, false, false) IMPLEMENT_CLASS(AFighterWeapon, false, false, false, false)
IMPLEMENT_CLASS(AClericWeapon, false, false, false) IMPLEMENT_CLASS(AClericWeapon, false, false, false, false)
IMPLEMENT_CLASS(AMageWeapon, false, false, false) IMPLEMENT_CLASS(AMageWeapon, false, false, false, false)
static FRandom pr_fpatk ("FPunchAttack"); static FRandom pr_fpatk ("FPunchAttack");

View file

@ -59,7 +59,7 @@ public:
int DoSpecialDamage(AActor *victim, int damage, FName damagetype); 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) int AFSwordMissile::DoSpecialDamage(AActor *victim, int damage, FName damagetype)
{ {

View file

@ -24,7 +24,7 @@ DECLARE_ACTION(A_CheckThrowBomb)
// Poison Bag Artifact (Flechette) ------------------------------------------ // Poison Bag Artifact (Flechette) ------------------------------------------
IMPLEMENT_CLASS(AArtiPoisonBag, false, false, false) IMPLEMENT_CLASS(AArtiPoisonBag, false, false, false, false)
// Poison Bag 1 (The Cleric's) ---------------------------------------------- // Poison Bag 1 (The Cleric's) ----------------------------------------------
@ -35,7 +35,7 @@ public:
bool Use (bool pickup); bool Use (bool pickup);
}; };
IMPLEMENT_CLASS(AArtiPoisonBag1, false, false, false) IMPLEMENT_CLASS(AArtiPoisonBag1, false, false, false, false)
bool AArtiPoisonBag1::Use (bool pickup) bool AArtiPoisonBag1::Use (bool pickup)
{ {
@ -60,7 +60,7 @@ public:
bool Use (bool pickup); bool Use (bool pickup);
}; };
IMPLEMENT_CLASS(AArtiPoisonBag2, false, false, false) IMPLEMENT_CLASS(AArtiPoisonBag2, false, false, false, false)
bool AArtiPoisonBag2::Use (bool pickup) bool AArtiPoisonBag2::Use (bool pickup)
{ {
@ -85,7 +85,7 @@ public:
bool Use (bool pickup); bool Use (bool pickup);
}; };
IMPLEMENT_CLASS(AArtiPoisonBag3, false, false, false) IMPLEMENT_CLASS(AArtiPoisonBag3, false, false, false, false)
bool AArtiPoisonBag3::Use (bool pickup) bool AArtiPoisonBag3::Use (bool pickup)
{ {
@ -136,7 +136,7 @@ public:
bool Use (bool pickup); bool Use (bool pickup);
}; };
IMPLEMENT_CLASS(AArtiPoisonBagGiver, false, false, false) IMPLEMENT_CLASS(AArtiPoisonBagGiver, false, false, false, false)
bool AArtiPoisonBagGiver::Use (bool pickup) bool AArtiPoisonBagGiver::Use (bool pickup)
{ {
@ -167,7 +167,7 @@ public:
bool Use (bool pickup); bool Use (bool pickup);
}; };
IMPLEMENT_CLASS(AArtiPoisonBagShooter, false, false, false) IMPLEMENT_CLASS(AArtiPoisonBagShooter, false, false, false, false)
bool AArtiPoisonBagShooter::Use (bool pickup) bool AArtiPoisonBagShooter::Use (bool pickup)
{ {
@ -296,7 +296,7 @@ public:
void BeginPlay (); void BeginPlay ();
}; };
IMPLEMENT_CLASS(APoisonCloud, false, false, false) IMPLEMENT_CLASS(APoisonCloud, false, false, false, false)
void APoisonCloud::BeginPlay () void APoisonCloud::BeginPlay ()
{ {

View file

@ -25,7 +25,7 @@ public:
bool Use (bool pickup); bool Use (bool pickup);
}; };
IMPLEMENT_CLASS(AArtiHealingRadius, false, false, false) IMPLEMENT_CLASS(AArtiHealingRadius, false, false, false, false)
bool AArtiHealingRadius::Use (bool pickup) bool AArtiHealingRadius::Use (bool pickup)
{ {

View file

@ -72,7 +72,7 @@ public:
void Die (AActor *source, AActor *inflictor, int dmgflags); 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) 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 ---------------------------------- // First ball (purple) - fires projectiles ----------------------------------
@ -140,7 +140,7 @@ public:
virtual void CastSorcererSpell (); virtual void CastSorcererSpell ();
}; };
IMPLEMENT_CLASS(ASorcBall1, false, false, false) IMPLEMENT_CLASS(ASorcBall1, false, false, false, false)
// Second ball (blue) - generates the shield -------------------------------- // Second ball (blue) - generates the shield --------------------------------
@ -156,7 +156,7 @@ public:
virtual void CastSorcererSpell (); virtual void CastSorcererSpell ();
}; };
IMPLEMENT_CLASS(ASorcBall2, false, false, false) IMPLEMENT_CLASS(ASorcBall2, false, false, false, false)
// Third ball (green) - summons Bishops ------------------------------------- // Third ball (green) - summons Bishops -------------------------------------
@ -172,7 +172,7 @@ public:
virtual void CastSorcererSpell (); virtual void CastSorcererSpell ();
}; };
IMPLEMENT_CLASS(ASorcBall3, false, false, false) IMPLEMENT_CLASS(ASorcBall3, false, false, false, false)
// Sorcerer spell 1 (The burning, bouncing head thing) ---------------------- // Sorcerer spell 1 (The burning, bouncing head thing) ----------------------

View file

@ -39,7 +39,7 @@ public:
void HitFloor (); void HitFloor ();
}; };
IMPLEMENT_CLASS(APottery1, false, false, false) IMPLEMENT_CLASS(APottery1, false, false, false, false)
void APottery1::HitFloor () void APottery1::HitFloor ()
{ {
@ -136,7 +136,7 @@ public:
void PostBeginPlay (); void PostBeginPlay ();
}; };
IMPLEMENT_CLASS(AZCorpseLynchedNoHeart, false, false, false) IMPLEMENT_CLASS(AZCorpseLynchedNoHeart, false, false, false, false)
void AZCorpseLynchedNoHeart::PostBeginPlay () void AZCorpseLynchedNoHeart::PostBeginPlay ()
{ {
@ -344,7 +344,7 @@ public:
void Activate (AActor *activator); void Activate (AActor *activator);
}; };
IMPLEMENT_CLASS(AZBell, false, false, false) IMPLEMENT_CLASS(AZBell, false, false, false, false)
void AZBell::Activate (AActor *activator) void AZBell::Activate (AActor *activator)
{ {

View file

@ -32,7 +32,7 @@ public:
int DoSpecialDamage (AActor *victim, int damage, FName damagetype); 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) int AFrostMissile::DoSpecialDamage (AActor *victim, int damage, FName damagetype)
{ {

View file

@ -34,7 +34,7 @@ public:
int SpecialMissileHit (AActor *victim); int SpecialMissileHit (AActor *victim);
}; };
IMPLEMENT_CLASS(ALightning, false, false, false) IMPLEMENT_CLASS(ALightning, false, false, false, false)
int ALightning::SpecialMissileHit (AActor *thing) int ALightning::SpecialMissileHit (AActor *thing)
{ {
@ -87,7 +87,7 @@ public:
int SpecialMissileHit (AActor *thing); int SpecialMissileHit (AActor *thing);
}; };
IMPLEMENT_CLASS(ALightningZap, false, false, false) IMPLEMENT_CLASS(ALightningZap, false, false, false, false)
int ALightningZap::SpecialMissileHit (AActor *thing) int ALightningZap::SpecialMissileHit (AActor *thing)
{ {

View file

@ -56,7 +56,7 @@ public:
BYTE MStaffCount; BYTE MStaffCount;
}; };
IMPLEMENT_CLASS(AMWeapBloodscourge, false, false, false) IMPLEMENT_CLASS(AMWeapBloodscourge, false, false, false, false)
// Mage Staff FX2 (Bloodscourge) -------------------------------------------- // Mage Staff FX2 (Bloodscourge) --------------------------------------------
@ -68,7 +68,7 @@ public:
bool SpecialBlastHandling (AActor *source, double strength); bool SpecialBlastHandling (AActor *source, double strength);
}; };
IMPLEMENT_CLASS(AMageStaffFX2, false, false, false) IMPLEMENT_CLASS(AMageStaffFX2, false, false, false, false)
int AMageStaffFX2::SpecialMissileHit (AActor *victim) int AMageStaffFX2::SpecialMissileHit (AActor *victim)
{ {

View file

@ -27,7 +27,7 @@ public:
void MorphPlayerThink (); void MorphPlayerThink ();
}; };
IMPLEMENT_CLASS(APigPlayer, false, false, false) IMPLEMENT_CLASS(APigPlayer, false, false, false, false)
void APigPlayer::MorphPlayerThink () void APigPlayer::MorphPlayerThink ()
{ {

View file

@ -31,7 +31,7 @@ public:
TObjPtr<AActor> DirtClump; TObjPtr<AActor> DirtClump;
}; };
IMPLEMENT_CLASS(AThrustFloor, false, true, false) IMPLEMENT_CLASS(AThrustFloor, false, true, false, false)
IMPLEMENT_POINTERS_START(AThrustFloor) IMPLEMENT_POINTERS_START(AThrustFloor)
IMPLEMENT_POINTER(DirtClump) IMPLEMENT_POINTER(DirtClump)

View file

@ -21,7 +21,7 @@ public:
bool Use (bool pickup); bool Use (bool pickup);
}; };
IMPLEMENT_CLASS(AArtiDarkServant, false, false, false) IMPLEMENT_CLASS(AArtiDarkServant, false, false, false, false)
//============================================================================ //============================================================================
// //

View file

@ -34,7 +34,7 @@ public:
bool Use (bool pickup); bool Use (bool pickup);
}; };
IMPLEMENT_CLASS(AArtiTeleportOther, false, false, false) IMPLEMENT_CLASS(AArtiTeleportOther, false, false, false, false)
// Teleport Other FX -------------------------------------------------------- // Teleport Other FX --------------------------------------------------------
@ -45,7 +45,7 @@ public:
int DoSpecialDamage (AActor *target, int damage, FName damagetype); 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) static void TeloSpawn (AActor *source, const char *type)
{ {

View file

@ -903,7 +903,7 @@ public:
void Tick (); void Tick ();
}; };
IMPLEMENT_CLASS(DAutosaver, false, false, false) IMPLEMENT_CLASS(DAutosaver, false, false, false, false)
void DAutosaver::Tick () void DAutosaver::Tick ()
{ {

View file

@ -23,7 +23,7 @@ public:
bool Use (bool pickup); bool Use (bool pickup);
}; };
IMPLEMENT_CLASS(AArtiTeleport, false, false, false) IMPLEMENT_CLASS(AArtiTeleport, false, false, false, false)
bool AArtiTeleport::Use (bool pickup) bool AArtiTeleport::Use (bool pickup)
{ {

View file

@ -31,7 +31,7 @@ void P_MinotaurSlam (AActor *source, AActor *target);
DECLARE_ACTION(A_MinotaurLook) DECLARE_ACTION(A_MinotaurLook)
IMPLEMENT_CLASS(AMinotaur, false, false, false) IMPLEMENT_CLASS(AMinotaur, false, false, false, false)
void AMinotaur::Tick () void AMinotaur::Tick ()
{ {
@ -72,7 +72,7 @@ int AMinotaur::DoSpecialDamage (AActor *target, int damage, FName damagetype)
// Minotaur Friend ---------------------------------------------------------- // Minotaur Friend ----------------------------------------------------------
IMPLEMENT_CLASS(AMinotaurFriend, false, false, false) IMPLEMENT_CLASS(AMinotaurFriend, false, false, false, false)
void AMinotaurFriend::BeginPlay () void AMinotaurFriend::BeginPlay ()
{ {

View file

@ -29,7 +29,7 @@ public:
void Deactivate (AActor *activator); void Deactivate (AActor *activator);
}; };
IMPLEMENT_CLASS(ASwitchableDecoration, false, false, false) IMPLEMENT_CLASS(ASwitchableDecoration, false, false, false, false)
void ASwitchableDecoration::Activate (AActor *activator) void ASwitchableDecoration::Activate (AActor *activator)
{ {
@ -50,7 +50,7 @@ public:
void Deactivate (AActor *activator) {} void Deactivate (AActor *activator) {}
}; };
IMPLEMENT_CLASS(ASwitchingDecoration, false, false, false) IMPLEMENT_CLASS(ASwitchingDecoration, false, false, false, false)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// //
@ -304,7 +304,7 @@ private:
DCorpsePointer () {} DCorpsePointer () {}
}; };
IMPLEMENT_CLASS(DCorpsePointer, false, true, false) IMPLEMENT_CLASS(DCorpsePointer, false, true, false, false)
IMPLEMENT_POINTERS_START(DCorpsePointer) IMPLEMENT_POINTERS_START(DCorpsePointer)
IMPLEMENT_POINTER(Corpse) IMPLEMENT_POINTER(Corpse)

View file

@ -8,11 +8,11 @@
#include "d_player.h" #include "d_player.h"
#include "serializer.h" #include "serializer.h"
IMPLEMENT_CLASS(AArmor, false, false, false) IMPLEMENT_CLASS(AArmor, false, false, false, false)
IMPLEMENT_CLASS(ABasicArmor, false, false, false) IMPLEMENT_CLASS(ABasicArmor, false, false, false, false)
IMPLEMENT_CLASS(ABasicArmorPickup, false, false, false) IMPLEMENT_CLASS(ABasicArmorPickup, false, false, false, false)
IMPLEMENT_CLASS(ABasicArmorBonus, false, false, false) IMPLEMENT_CLASS(ABasicArmorBonus, false, false, false, false)
IMPLEMENT_CLASS(AHexenArmor, false, false, false) IMPLEMENT_CLASS(AHexenArmor, false, false, false, false)
//=========================================================================== //===========================================================================
// //

View file

@ -40,11 +40,11 @@ static FRandom pr_torch ("Torch");
#define TIMEFREEZE_TICS ( 12 * TICRATE ) #define TIMEFREEZE_TICS ( 12 * TICRATE )
*/ */
IMPLEMENT_CLASS(APowerup, false, false, false) IMPLEMENT_CLASS(APowerup, false, false, false, false)
// Powerup-Giver ------------------------------------------------------------- // Powerup-Giver -------------------------------------------------------------
IMPLEMENT_CLASS(PClassPowerupGiver, false, false, false) IMPLEMENT_CLASS(PClassPowerupGiver, false, false, false, false)
void PClassPowerupGiver::ReplaceClassRef(PClass *oldclass, PClass *newclass) void PClassPowerupGiver::ReplaceClassRef(PClass *oldclass, PClass *newclass)
{ {
@ -376,7 +376,7 @@ bool APowerup::GetNoTeleportFreeze ()
// Invulnerability Powerup --------------------------------------------------- // 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 -------------------------------------------- // 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 ------------------------------------------------------ // Invisibility Powerup ------------------------------------------------------
IMPLEMENT_CLASS(APowerInvisibility, false, false, false) IMPLEMENT_CLASS(APowerInvisibility, false, false, false, false)
// Invisibility flag combos // Invisibility flag combos
#define INVISIBILITY_FLAGS1 (MF_SHADOW) #define INVISIBILITY_FLAGS1 (MF_SHADOW)
@ -783,7 +783,7 @@ bool APowerInvisibility::HandlePickup (AInventory *item)
// Ironfeet Powerup ---------------------------------------------------------- // 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 ------------------------------------------- // 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 --------------------------------------------------------- // 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 ------------------------------------------------------------- // 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 --------------------------------------- // 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 -------------------------------- // 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 (); void Tick ();
}; };
IMPLEMENT_CLASS(APlayerSpeedTrail, false, false, false) IMPLEMENT_CLASS(APlayerSpeedTrail, false, false, false, false)
//=========================================================================== //===========================================================================
// //
@ -1216,7 +1216,7 @@ void APlayerSpeedTrail::Tick ()
// Speed Powerup ------------------------------------------------------------- // 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 --------------------------------------- // Minotaur (aka Dark Servant) powerup ---------------------------------------
IMPLEMENT_CLASS(APowerMinotaur, false, false, false) IMPLEMENT_CLASS(APowerMinotaur, false, false, false, false)
// Targeter powerup --------------------------------------------------------- // Targeter powerup ---------------------------------------------------------
IMPLEMENT_CLASS(APowerTargeter, false, false, false) IMPLEMENT_CLASS(APowerTargeter, false, false, false, false)
void APowerTargeter::Travelled () void APowerTargeter::Travelled ()
{ {
@ -1422,7 +1422,7 @@ void APowerTargeter::PositionAccuracy ()
// Frightener Powerup -------------------------------- // Frightener Powerup --------------------------------
IMPLEMENT_CLASS(APowerFrightener, false, false, false) IMPLEMENT_CLASS(APowerFrightener, false, false, false, false)
//=========================================================================== //===========================================================================
// //
@ -1458,7 +1458,7 @@ void APowerFrightener::EndEffect ()
// Buddha Powerup -------------------------------- // Buddha Powerup --------------------------------
IMPLEMENT_CLASS(APowerBuddha, false, false, false) IMPLEMENT_CLASS(APowerBuddha, false, false, false, false)
//=========================================================================== //===========================================================================
// //
@ -1494,11 +1494,11 @@ void APowerBuddha::EndEffect ()
// Scanner powerup ---------------------------------------------------------- // Scanner powerup ----------------------------------------------------------
IMPLEMENT_CLASS(APowerScanner, false, false, false) IMPLEMENT_CLASS(APowerScanner, false, false, false, false)
// Time freezer powerup ----------------------------------------------------- // 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 ------------------------------------------------------ // 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 ------------------------------------------------------ // 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_FLAGS3 (MF3_NORADIUSDMG | MF3_DONTMORPH | MF3_DONTSQUASH | MF3_DONTBLAST | MF3_NOTELEOTHER)
#define PROTECTION_FLAGS5 (MF5_NOPAIN | MF5_DONTRIP) #define PROTECTION_FLAGS5 (MF5_NOPAIN | MF5_DONTRIP)
@ -1760,7 +1760,7 @@ void APowerProtection::ModifyDamage(int damage, FName damageType, int &newdamage
// Drain rune ------------------------------------------------------- // Drain rune -------------------------------------------------------
IMPLEMENT_CLASS(APowerDrain, false, false, false) IMPLEMENT_CLASS(APowerDrain, false, false, false, false)
//=========================================================================== //===========================================================================
// //
@ -1800,7 +1800,7 @@ void APowerDrain::EndEffect( )
// Regeneration rune ------------------------------------------------------- // 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 ------------------------------------------------------- // 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 --------------------------------------------- // 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 ------------------------------------------------------ // 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 ----------------------------------------------------- // Infinite Ammo Powerup -----------------------------------------------------
IMPLEMENT_CLASS(APowerInfiniteAmmo, false, false, false) IMPLEMENT_CLASS(APowerInfiniteAmmo, false, false, false, false)
//=========================================================================== //===========================================================================
// //

View file

@ -41,7 +41,7 @@ public:
void Destroy(); void Destroy();
}; };
IMPLEMENT_CLASS(ACustomBridge, false, false, false) IMPLEMENT_CLASS(ACustomBridge, false, false, false, false)
void ACustomBridge::BeginPlay () void ACustomBridge::BeginPlay ()
{ {
@ -156,7 +156,7 @@ public:
void BeginPlay (); void BeginPlay ();
}; };
IMPLEMENT_CLASS(AInvisibleBridge, false, false, false) IMPLEMENT_CLASS(AInvisibleBridge, false, false, false, false)
void AInvisibleBridge::BeginPlay () void AInvisibleBridge::BeginPlay ()
{ {

View file

@ -64,7 +64,7 @@ protected:
DAngle Range; DAngle Range;
}; };
IMPLEMENT_CLASS(ASecurityCamera, false, false, false) IMPLEMENT_CLASS(ASecurityCamera, false, false, false, false)
void ASecurityCamera::Serialize(FSerializer &arc) void ASecurityCamera::Serialize(FSerializer &arc)
{ {
@ -124,7 +124,7 @@ protected:
DAngle MaxPitchChange; DAngle MaxPitchChange;
}; };
IMPLEMENT_CLASS(AAimingCamera, false, false, false) IMPLEMENT_CLASS(AAimingCamera, false, false, false, false)
void AAimingCamera::Serialize(FSerializer &arc) void AAimingCamera::Serialize(FSerializer &arc)
{ {

View file

@ -25,7 +25,7 @@ public:
} }
}; };
IMPLEMENT_CLASS(AGlassShard, false, false, false) IMPLEMENT_CLASS(AGlassShard, false, false, false, false)
// Dirt stuff // Dirt stuff

View file

@ -58,14 +58,14 @@ static int ImpactCount;
CVAR (Bool, cl_spreaddecals, true, CVAR_ARCHIVE) 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_POINTERS_START(DBaseDecal)
IMPLEMENT_POINTER(WallPrev) IMPLEMENT_POINTER(WallPrev)
IMPLEMENT_POINTER(WallNext) IMPLEMENT_POINTER(WallNext)
IMPLEMENT_POINTERS_END IMPLEMENT_POINTERS_END
IMPLEMENT_CLASS(DImpactDecal, false, false, false) IMPLEMENT_CLASS(DImpactDecal, false, false, false, false)
DBaseDecal::DBaseDecal () DBaseDecal::DBaseDecal ()
: DThinker(STAT_DECAL), : DThinker(STAT_DECAL),
@ -746,7 +746,7 @@ public:
void BeginPlay (); void BeginPlay ();
}; };
IMPLEMENT_CLASS(ADecal, false, false, false) IMPLEMENT_CLASS(ADecal, false, false, false, false)
void ADecal::BeginPlay () void ADecal::BeginPlay ()
{ {

View file

@ -7,7 +7,7 @@
#include "b_bot.h" #include "b_bot.h"
#include "p_checkposition.h" #include "p_checkposition.h"
IMPLEMENT_CLASS(AFastProjectile, false, false, false) IMPLEMENT_CLASS(AFastProjectile, false, false, false, false)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

View file

@ -3,7 +3,7 @@
#include "d_player.h" #include "d_player.h"
#include "serializer.h" #include "serializer.h"
IMPLEMENT_CLASS(DFlashFader, false, true, false) IMPLEMENT_CLASS(DFlashFader, false, true, false, false)
IMPLEMENT_POINTERS_START(DFlashFader) IMPLEMENT_POINTERS_START(DFlashFader)
IMPLEMENT_POINTER(ForWho) IMPLEMENT_POINTER(ForWho)

View file

@ -46,7 +46,7 @@ public:
void Deactivate (AActor *activator); void Deactivate (AActor *activator);
}; };
IMPLEMENT_CLASS(AParticleFountain, false, false, false) IMPLEMENT_CLASS(AParticleFountain, false, false, false, false)
void AParticleFountain::PostBeginPlay () void AParticleFountain::PostBeginPlay ()
{ {

View file

@ -46,7 +46,7 @@ public:
int TakeSpecialDamage(AActor *inflictor, AActor *source, int damage, FName damagetype); 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() void AHateTarget::BeginPlay()
{ {

View file

@ -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) bool AKey::HandlePickup (AInventory *item)
{ {

View file

@ -13,7 +13,7 @@
static FRandom pr_lightning ("Lightning"); static FRandom pr_lightning ("Lightning");
IMPLEMENT_CLASS(DLightningThinker, false, false, false) IMPLEMENT_CLASS(DLightningThinker, false, false, false, false)
DLightningThinker::DLightningThinker () DLightningThinker::DLightningThinker ()
: DThinker (STAT_LIGHTNING) : DThinker (STAT_LIGHTNING)

View file

@ -51,7 +51,7 @@
// //
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
IMPLEMENT_CLASS(AMapMarker, false, false, false) IMPLEMENT_CLASS(AMapMarker, false, false, false, false)
void AMapMarker::BeginPlay () void AMapMarker::BeginPlay ()
{ {

View file

@ -616,7 +616,7 @@ void InitAllPowerupEffects(AInventory *item)
// Base class for morphing projectiles -------------------------------------- // 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) 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) --------- // 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_POINTERS_START(AMorphedMonster)
IMPLEMENT_POINTER(UnmorphedMe) IMPLEMENT_POINTER(UnmorphedMe)

View file

@ -66,7 +66,7 @@ public:
TObjPtr<AInterpolationPoint> Next; TObjPtr<AInterpolationPoint> Next;
}; };
IMPLEMENT_CLASS(AInterpolationPoint, false, true, false) IMPLEMENT_CLASS(AInterpolationPoint, false, true, false, false)
IMPLEMENT_POINTERS_START(AInterpolationPoint) IMPLEMENT_POINTERS_START(AInterpolationPoint)
IMPLEMENT_POINTER(Next) IMPLEMENT_POINTER(Next)
@ -135,7 +135,7 @@ public:
void Tick () {} // Does absolutely nothing itself 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 == PathFollower: something that follows a camera path
@ -178,7 +178,7 @@ protected:
int HoldTime; int HoldTime;
}; };
IMPLEMENT_CLASS(APathFollower, false, true, false) IMPLEMENT_CLASS(APathFollower, false, true, false, false)
IMPLEMENT_POINTERS_START(APathFollower) IMPLEMENT_POINTERS_START(APathFollower)
IMPLEMENT_POINTER(PrevNode) IMPLEMENT_POINTER(PrevNode)
@ -480,7 +480,7 @@ protected:
bool Interpolate (); bool Interpolate ();
}; };
IMPLEMENT_CLASS(AActorMover, false, false, false) IMPLEMENT_CLASS(AActorMover, false, false, false, false)
void AActorMover::BeginPlay() void AActorMover::BeginPlay()
{ {
@ -596,7 +596,7 @@ protected:
TObjPtr<AActor> Activator; TObjPtr<AActor> Activator;
}; };
IMPLEMENT_CLASS(AMovingCamera, false, true, false) IMPLEMENT_CLASS(AMovingCamera, false, true, false, false)
IMPLEMENT_POINTERS_START(AMovingCamera) IMPLEMENT_POINTERS_START(AMovingCamera)
IMPLEMENT_POINTER(Activator) IMPLEMENT_POINTER(Activator)

View file

@ -24,7 +24,7 @@
static FRandom pr_restore ("RestorePos"); static FRandom pr_restore ("RestorePos");
IMPLEMENT_CLASS(PClassInventory, false, false, false) IMPLEMENT_CLASS(PClassInventory, false, false, false, false)
PClassInventory::PClassInventory() PClassInventory::PClassInventory()
{ {
@ -71,7 +71,7 @@ void PClassInventory::Finalize(FStateDefinitions &statedef)
((AActor*)Defaults)->flags |= MF_SPECIAL; ((AActor*)Defaults)->flags |= MF_SPECIAL;
} }
IMPLEMENT_CLASS(PClassAmmo, false, false, false) IMPLEMENT_CLASS(PClassAmmo, false, false, false, false)
PClassAmmo::PClassAmmo() PClassAmmo::PClassAmmo()
{ {
@ -87,7 +87,7 @@ void PClassAmmo::DeriveData(PClass *newclass)
newc->DropAmount = DropAmount; 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; int AInventory::StaticLastMessageTic;
const char *AInventory::StaticLastMessage; const char *AInventory::StaticLastMessage;
IMPLEMENT_CLASS(AInventory, false, true, false) IMPLEMENT_CLASS(AInventory, false, true, false, false)
IMPLEMENT_POINTERS_START(AInventory) IMPLEMENT_POINTERS_START(AInventory)
IMPLEMENT_POINTER(Owner) IMPLEMENT_POINTER(Owner)
@ -1354,7 +1354,7 @@ bool AInventory::DrawPowerup (int x, int y)
/* AArtifact implementation */ /* 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(AStateProvider, false, false, false, false)
IMPLEMENT_CLASS(ACustomInventory, false, false, false) IMPLEMENT_CLASS(ACustomInventory, false, false, false, false)
//=========================================================================== //===========================================================================
// //
@ -1690,7 +1690,7 @@ bool ACustomInventory::TryPickup (AActor *&toucher)
return useok; 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; 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; 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(ABackpackItem, false, false, false, false)
IMPLEMENT_CLASS(AMapRevealer, 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)
//=========================================================================== //===========================================================================
// //

View file

@ -8,7 +8,7 @@
#include "doomstat.h" #include "doomstat.h"
#include "v_font.h" #include "v_font.h"
IMPLEMENT_CLASS(PClassPuzzleItem, false, false, false) IMPLEMENT_CLASS(PClassPuzzleItem, false, false, false, false)
void PClassPuzzleItem::DeriveData(PClass *newclass) void PClassPuzzleItem::DeriveData(PClass *newclass)
{ {
@ -17,7 +17,7 @@ void PClassPuzzleItem::DeriveData(PClass *newclass)
static_cast<PClassPuzzleItem *>(newclass)->PuzzFailMessage = PuzzFailMessage; static_cast<PClassPuzzleItem *>(newclass)->PuzzFailMessage = PuzzFailMessage;
} }
IMPLEMENT_CLASS(APuzzleItem, false, false, false) IMPLEMENT_CLASS(APuzzleItem, false, false, false, false)
bool APuzzleItem::HandlePickup (AInventory *item) bool APuzzleItem::HandlePickup (AInventory *item)
{ {

View file

@ -14,7 +14,7 @@
static FRandom pr_quake ("Quake"); static FRandom pr_quake ("Quake");
IMPLEMENT_CLASS(DEarthquake, false, true, false) IMPLEMENT_CLASS(DEarthquake, false, true, false, false)
IMPLEMENT_POINTERS_START(DEarthquake) IMPLEMENT_POINTERS_START(DEarthquake)
IMPLEMENT_POINTER(m_Spot) IMPLEMENT_POINTER(m_Spot)

View file

@ -231,4 +231,4 @@ class ARandomSpawner : public AActor
}; };
IMPLEMENT_CLASS(ARandomSpawner, false, false, false) IMPLEMENT_CLASS(ARandomSpawner, false, false, false, false)

View file

@ -50,7 +50,7 @@ public:
void Activate (AActor *activator); void Activate (AActor *activator);
}; };
IMPLEMENT_CLASS(ASecretTrigger, false, false, false) IMPLEMENT_CLASS(ASecretTrigger, false, false, false, false)
void ASecretTrigger::PostBeginPlay () void ASecretTrigger::PostBeginPlay ()
{ {

View file

@ -37,7 +37,7 @@
// The base class for sector actions ---------------------------------------- // The base class for sector actions ----------------------------------------
IMPLEMENT_CLASS(ASectorAction, false, false, false) IMPLEMENT_CLASS(ASectorAction, false, false, false, false)
ASectorAction::ASectorAction (bool activatedByUse) : ASectorAction::ASectorAction (bool activatedByUse) :
ActivatedByUse (activatedByUse) {} ActivatedByUse (activatedByUse) {}
@ -142,7 +142,7 @@ public:
bool DoTriggerAction (AActor *triggerer, int activationType); 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) bool ASecActEnter::DoTriggerAction (AActor *triggerer, int activationType)
@ -160,7 +160,7 @@ public:
bool DoTriggerAction (AActor *triggerer, int activationType); 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) bool ASecActExit::DoTriggerAction (AActor *triggerer, int activationType)
@ -181,7 +181,7 @@ public:
// Skull Tag uses 9999 for a special that is triggered whenever // 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. // 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) bool ASecActHitFloor::DoTriggerAction (AActor *triggerer, int activationType)
@ -199,7 +199,7 @@ public:
bool DoTriggerAction (AActor *triggerer, int activationType); 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) bool ASecActHitCeil::DoTriggerAction (AActor *triggerer, int activationType)
@ -218,7 +218,7 @@ public:
bool DoTriggerAction (AActor *triggerer, int activationType); 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) bool ASecActUse::DoTriggerAction (AActor *triggerer, int activationType)
@ -237,7 +237,7 @@ public:
bool DoTriggerAction (AActor *triggerer, int activationType); 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) bool ASecActUseWall::DoTriggerAction (AActor *triggerer, int activationType)
@ -255,7 +255,7 @@ public:
bool DoTriggerAction (AActor *triggerer, int activationType); 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) bool ASecActEyesDive::DoTriggerAction (AActor *triggerer, int activationType)
@ -273,7 +273,7 @@ public:
bool DoTriggerAction (AActor *triggerer, int activationType); 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) bool ASecActEyesSurface::DoTriggerAction (AActor *triggerer, int activationType)
@ -291,7 +291,7 @@ public:
bool DoTriggerAction (AActor *triggerer, int activationType); 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) bool ASecActEyesBelowC::DoTriggerAction (AActor *triggerer, int activationType)
@ -309,7 +309,7 @@ public:
bool DoTriggerAction (AActor *triggerer, int activationType); 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) bool ASecActEyesAboveC::DoTriggerAction (AActor *triggerer, int activationType)
@ -327,7 +327,7 @@ public:
bool DoTriggerAction (AActor *triggerer, int activationType); 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) bool ASecActHitFakeFloor::DoTriggerAction (AActor *triggerer, int activationType)

View file

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

View file

@ -42,7 +42,7 @@
// arg0 = Visibility*4 for this skybox // 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 // If this actor has no TID, make it the default sky box
void ASkyViewpoint::BeginPlay () void ASkyViewpoint::BeginPlay ()
@ -73,7 +73,7 @@ void ASkyViewpoint::Destroy ()
Super::Destroy(); Super::Destroy();
} }
IMPLEMENT_CLASS(ASkyCamCompat, false, false, false) IMPLEMENT_CLASS(ASkyCamCompat, false, false, false, false)
void ASkyCamCompat::BeginPlay() void ASkyCamCompat::BeginPlay()
{ {
@ -98,7 +98,7 @@ public:
void PostBeginPlay (); void PostBeginPlay ();
}; };
IMPLEMENT_CLASS(ASkyPicker, false, false, false) IMPLEMENT_CLASS(ASkyPicker, false, false, false, false)
void ASkyPicker::PostBeginPlay () void ASkyPicker::PostBeginPlay ()
{ {
@ -142,7 +142,7 @@ void ASkyPicker::PostBeginPlay ()
// arg0 = opacity of plane; 0 = invisible, 255 = fully opaque // 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 () void AStackPoint::BeginPlay ()
{ {
@ -160,7 +160,7 @@ public:
void Destroy (); void Destroy ();
}; };
IMPLEMENT_CLASS(ASectorSilencer, false, false, false) IMPLEMENT_CLASS(ASectorSilencer, false, false, false, false)
void ASectorSilencer::BeginPlay () void ASectorSilencer::BeginPlay ()
{ {
@ -184,7 +184,7 @@ public:
void BeginPlay (); void BeginPlay ();
}; };
IMPLEMENT_CLASS(ASectorFlagSetter, false, false, false) IMPLEMENT_CLASS(ASectorFlagSetter, false, false, false, false)
void ASectorFlagSetter::BeginPlay () void ASectorFlagSetter::BeginPlay ()
{ {

View file

@ -46,7 +46,7 @@ public:
void Activate (AActor *deactivator); void Activate (AActor *deactivator);
}; };
IMPLEMENT_CLASS(ASoundEnvironment, false, false, false) IMPLEMENT_CLASS(ASoundEnvironment, false, false, false, false)
void ASoundEnvironment::PostBeginPlay () void ASoundEnvironment::PostBeginPlay ()
{ {

View file

@ -80,7 +80,7 @@ public:
TObjPtr<DSeqNode> Sequence; TObjPtr<DSeqNode> Sequence;
}; };
IMPLEMENT_CLASS(ASoundSequenceSlot, false, true, false) IMPLEMENT_CLASS(ASoundSequenceSlot, false, true, false, false)
IMPLEMENT_POINTERS_START(ASoundSequenceSlot) IMPLEMENT_POINTERS_START(ASoundSequenceSlot)
IMPLEMENT_POINTER(Sequence) IMPLEMENT_POINTER(Sequence)
@ -111,7 +111,7 @@ public:
void MarkPrecacheSounds () const; void MarkPrecacheSounds () const;
}; };
IMPLEMENT_CLASS(ASoundSequence, false, false, false) IMPLEMENT_CLASS(ASoundSequence, false, false, false, false)
//========================================================================== //==========================================================================
// //

View file

@ -45,7 +45,7 @@ public:
void Activate (AActor *activator); void Activate (AActor *activator);
}; };
IMPLEMENT_CLASS(ASpark, false, false, false) IMPLEMENT_CLASS(ASpark, false, false, false, false)
void ASpark::Activate (AActor *activator) void ASpark::Activate (AActor *activator)
{ {

View file

@ -45,8 +45,8 @@
static FRandom pr_spot ("SpecialSpot"); static FRandom pr_spot ("SpecialSpot");
static FRandom pr_spawnmace ("SpawnMace"); static FRandom pr_spawnmace ("SpawnMace");
IMPLEMENT_CLASS(DSpotState, false, false, false) IMPLEMENT_CLASS(DSpotState, false, false, false, false)
IMPLEMENT_CLASS(ASpecialSpot, false, false, false) IMPLEMENT_CLASS(ASpecialSpot, false, false, false, false)
TObjPtr<DSpotState> DSpotState::SpotState; TObjPtr<DSpotState> DSpotState::SpotState;
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

View file

@ -42,7 +42,7 @@ public:
void PostBeginPlay (); void PostBeginPlay ();
}; };
IMPLEMENT_CLASS(AWaterZone, false, false, false) IMPLEMENT_CLASS(AWaterZone, false, false, false, false)
void AWaterZone::PostBeginPlay () void AWaterZone::PostBeginPlay ()
{ {

View file

@ -3,8 +3,8 @@
#include "doomstat.h" #include "doomstat.h"
#include "serializer.h" #include "serializer.h"
IMPLEMENT_CLASS(PClassWeaponPiece, false, false, false) IMPLEMENT_CLASS(PClassWeaponPiece, false, false, false, false)
IMPLEMENT_CLASS(AWeaponHolder, false, false, false) IMPLEMENT_CLASS(AWeaponHolder, false, false, false, false)
void PClassWeaponPiece::ReplaceClassRef(PClass *oldclass, PClass *newclass) void PClassWeaponPiece::ReplaceClassRef(PClass *oldclass, PClass *newclass)
{ {
@ -24,7 +24,7 @@ void AWeaponHolder::Serialize(FSerializer &arc)
("pieceweapon", PieceWeapon); ("pieceweapon", PieceWeapon);
} }
IMPLEMENT_CLASS(AWeaponPiece, false, true, false) IMPLEMENT_CLASS(AWeaponPiece, false, true, false, false)
IMPLEMENT_POINTERS_START(AWeaponPiece) IMPLEMENT_POINTERS_START(AWeaponPiece)
IMPLEMENT_POINTER(FullWeapon) IMPLEMENT_POINTER(FullWeapon)

View file

@ -21,7 +21,7 @@
#define BONUSADD 6 #define BONUSADD 6
IMPLEMENT_CLASS(AWeapon, false, true, false) IMPLEMENT_CLASS(AWeapon, false, true, false, false)
IMPLEMENT_POINTERS_START(AWeapon) IMPLEMENT_POINTERS_START(AWeapon)
IMPLEMENT_POINTER(Ammo1) IMPLEMENT_POINTER(Ammo1)
@ -38,7 +38,7 @@ TMap<PClassWeapon *, int> Weapons_hton;
static int ntoh_cmp(const void *a, const void *b); 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() PClassWeapon::PClassWeapon()
{ {
@ -791,7 +791,7 @@ FState *AWeapon::GetStateForButtonName (FName button)
/* Weapon giver ***********************************************************/ /* Weapon giver ***********************************************************/
IMPLEMENT_CLASS(AWeaponGiver, false, false, false) IMPLEMENT_CLASS(AWeaponGiver, false, false, false, false)
void AWeaponGiver::Serialize(FSerializer &arc) void AWeaponGiver::Serialize(FSerializer &arc)
{ {

View file

@ -44,15 +44,15 @@
EXTERN_CVAR(Int, con_scaletext) EXTERN_CVAR(Int, con_scaletext)
int active_con_scaletext(); int active_con_scaletext();
IMPLEMENT_CLASS(DHUDMessage, false, true, false) IMPLEMENT_CLASS(DHUDMessage, false, true, false, false)
IMPLEMENT_POINTERS_START(DHUDMessage) IMPLEMENT_POINTERS_START(DHUDMessage)
IMPLEMENT_POINTER(Next) IMPLEMENT_POINTER(Next)
IMPLEMENT_POINTERS_END IMPLEMENT_POINTERS_END
IMPLEMENT_CLASS(DHUDMessageFadeOut, false, false, false) IMPLEMENT_CLASS(DHUDMessageFadeOut, false, false, false, false)
IMPLEMENT_CLASS(DHUDMessageFadeInOut, false, false, false) IMPLEMENT_CLASS(DHUDMessageFadeInOut, false, false, false, false)
IMPLEMENT_CLASS(DHUDMessageTypeOnFadeOut, false, false, false) IMPLEMENT_CLASS(DHUDMessageTypeOnFadeOut, false, false, false, false)
/************************************************************************* /*************************************************************************
* Basic HUD message. Appears and disappears without any special effects * * Basic HUD message. Appears and disappears without any special effects *

View file

@ -1531,7 +1531,7 @@ private:
SBarInfoMainBlock *lastPopup; SBarInfoMainBlock *lastPopup;
}; };
IMPLEMENT_CLASS(DSBarInfo, false, true, false) IMPLEMENT_CLASS(DSBarInfo, false, true, false, false)
IMPLEMENT_POINTERS_START(DSBarInfo) IMPLEMENT_POINTERS_START(DSBarInfo)
IMPLEMENT_POINTER(ammo1) IMPLEMENT_POINTER(ammo1)

View file

@ -62,7 +62,7 @@
#define XHAIRPICKUPSIZE (2+XHAIRSHRINKSIZE) #define XHAIRPICKUPSIZE (2+XHAIRSHRINKSIZE)
#define POWERUPICONSIZE 32 #define POWERUPICONSIZE 32
IMPLEMENT_CLASS(DBaseStatusBar, false, true, false) IMPLEMENT_CLASS(DBaseStatusBar, false, true, false, false)
IMPLEMENT_POINTERS_START(DBaseStatusBar) IMPLEMENT_POINTERS_START(DBaseStatusBar)
IMPLEMENT_POINTER(Messages[0]) IMPLEMENT_POINTER(Messages[0])

View file

@ -6,7 +6,7 @@
// Coin --------------------------------------------------------------------- // Coin ---------------------------------------------------------------------
IMPLEMENT_CLASS(ACoin, false, false, false) IMPLEMENT_CLASS(ACoin, false, false, false, false)
const char *ACoin::PickupMessage () const char *ACoin::PickupMessage ()
{ {

View file

@ -17,7 +17,7 @@ public:
int DoSpecialDamage (AActor *victim, int damage, FName damagetype); 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) int ALoreShot::DoSpecialDamage (AActor *victim, int damage, FName damagetype)
{ {

View file

@ -23,7 +23,7 @@ public:
PalEntry GetBlend (); PalEntry GetBlend ();
}; };
IMPLEMENT_CLASS(AProgLevelEnder, false, false, false) IMPLEMENT_CLASS(AProgLevelEnder, false, false, false, false)
//============================================================================ //============================================================================
// //

View file

@ -47,7 +47,7 @@ public:
bool Use (bool pickup); bool Use (bool pickup);
}; };
IMPLEMENT_CLASS(ATeleporterBeacon, false, false, false) IMPLEMENT_CLASS(ATeleporterBeacon, false, false, false, false)
bool ATeleporterBeacon::Use (bool pickup) bool ATeleporterBeacon::Use (bool pickup)
{ {

View file

@ -16,7 +16,7 @@ public:
void Touch (AActor *toucher); void Touch (AActor *toucher);
}; };
IMPLEMENT_CLASS(ASpectralMonster, false, false, false) IMPLEMENT_CLASS(ASpectralMonster, false, false, false, false)
void ASpectralMonster::Touch (AActor *toucher) void ASpectralMonster::Touch (AActor *toucher)
{ {

View file

@ -19,7 +19,7 @@
*/ */
// Degnin Ore --------------------------------------------------------------- // Degnin Ore ---------------------------------------------------------------
IMPLEMENT_CLASS(ADegninOre, false, false, false) IMPLEMENT_CLASS(ADegninOre, false, false, false, false)
DEFINE_ACTION_FUNCTION(AActor, A_RemoveForceField) DEFINE_ACTION_FUNCTION(AActor, A_RemoveForceField)
{ {
@ -75,7 +75,7 @@ public:
bool TryPickup (AActor *&toucher); bool TryPickup (AActor *&toucher);
}; };
IMPLEMENT_CLASS(AHealthTraining, false, false, false) IMPLEMENT_CLASS(AHealthTraining, false, false, false, false)
bool AHealthTraining::TryPickup (AActor *&toucher) bool AHealthTraining::TryPickup (AActor *&toucher)
{ {
@ -105,7 +105,7 @@ public:
bool Use (bool pickup); bool Use (bool pickup);
}; };
IMPLEMENT_CLASS(AScanner, false, false, false) IMPLEMENT_CLASS(AScanner, false, false, false, false)
bool AScanner::Use (bool pickup) bool AScanner::Use (bool pickup)
{ {
@ -130,7 +130,7 @@ public:
bool SpecialDropAction (AActor *dropper); bool SpecialDropAction (AActor *dropper);
}; };
IMPLEMENT_CLASS(APrisonPass, false, false, false) IMPLEMENT_CLASS(APrisonPass, false, false, false, false)
bool APrisonPass::TryPickup (AActor *&toucher) bool APrisonPass::TryPickup (AActor *&toucher)
{ {
@ -163,7 +163,7 @@ bool APrisonPass::SpecialDropAction (AActor *dropper)
// actions and cannot be held. ---------------------------------------------- // actions and cannot be held. ----------------------------------------------
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
IMPLEMENT_CLASS(ADummyStrifeItem, false, false, false) IMPLEMENT_CLASS(ADummyStrifeItem, false, false, false, false)
// Sound the alarm! --------------------------------------------------------- // Sound the alarm! ---------------------------------------------------------
@ -175,7 +175,7 @@ public:
bool SpecialDropAction (AActor *dropper); bool SpecialDropAction (AActor *dropper);
}; };
IMPLEMENT_CLASS(ARaiseAlarm, false, false, false) IMPLEMENT_CLASS(ARaiseAlarm, false, false, false, false)
bool ARaiseAlarm::TryPickup (AActor *&toucher) bool ARaiseAlarm::TryPickup (AActor *&toucher)
{ {
@ -209,7 +209,7 @@ public:
bool TryPickup (AActor *&toucher); bool TryPickup (AActor *&toucher);
}; };
IMPLEMENT_CLASS(AOpenDoor222, false, false, false) IMPLEMENT_CLASS(AOpenDoor222, false, false, false, false)
bool AOpenDoor222::TryPickup (AActor *&toucher) bool AOpenDoor222::TryPickup (AActor *&toucher)
{ {
@ -228,7 +228,7 @@ public:
bool SpecialDropAction (AActor *dropper); bool SpecialDropAction (AActor *dropper);
}; };
IMPLEMENT_CLASS(ACloseDoor222, false, false, false) IMPLEMENT_CLASS(ACloseDoor222, false, false, false, false)
bool ACloseDoor222::TryPickup (AActor *&toucher) bool ACloseDoor222::TryPickup (AActor *&toucher)
{ {
@ -262,7 +262,7 @@ public:
bool SpecialDropAction (AActor *dropper); bool SpecialDropAction (AActor *dropper);
}; };
IMPLEMENT_CLASS(AOpenDoor224, false, false, false) IMPLEMENT_CLASS(AOpenDoor224, false, false, false, false)
bool AOpenDoor224::TryPickup (AActor *&toucher) bool AOpenDoor224::TryPickup (AActor *&toucher)
{ {
@ -287,7 +287,7 @@ public:
bool TryPickup (AActor *&toucher); bool TryPickup (AActor *&toucher);
}; };
IMPLEMENT_CLASS(AAmmoFillup, false, false, false) IMPLEMENT_CLASS(AAmmoFillup, false, false, false, false)
bool AAmmoFillup::TryPickup (AActor *&toucher) bool AAmmoFillup::TryPickup (AActor *&toucher)
{ {
@ -325,7 +325,7 @@ public:
bool TryPickup (AActor *&toucher); bool TryPickup (AActor *&toucher);
}; };
IMPLEMENT_CLASS(AHealthFillup, false, false, false) IMPLEMENT_CLASS(AHealthFillup, false, false, false, false)
bool AHealthFillup::TryPickup (AActor *&toucher) bool AHealthFillup::TryPickup (AActor *&toucher)
{ {
@ -342,7 +342,7 @@ bool AHealthFillup::TryPickup (AActor *&toucher)
// Upgrade Stamina ---------------------------------------------------------- // Upgrade Stamina ----------------------------------------------------------
IMPLEMENT_CLASS(AUpgradeStamina, false, false, false) IMPLEMENT_CLASS(AUpgradeStamina, false, false, false, false)
bool AUpgradeStamina::TryPickup (AActor *&toucher) bool AUpgradeStamina::TryPickup (AActor *&toucher)
{ {
@ -360,7 +360,7 @@ bool AUpgradeStamina::TryPickup (AActor *&toucher)
// Upgrade Accuracy --------------------------------------------------------- // Upgrade Accuracy ---------------------------------------------------------
IMPLEMENT_CLASS(AUpgradeAccuracy, false, false, false) IMPLEMENT_CLASS(AUpgradeAccuracy, false, false, false, false)
bool AUpgradeAccuracy::TryPickup (AActor *&toucher) bool AUpgradeAccuracy::TryPickup (AActor *&toucher)
{ {
@ -373,7 +373,7 @@ bool AUpgradeAccuracy::TryPickup (AActor *&toucher)
// Start a slideshow -------------------------------------------------------- // Start a slideshow --------------------------------------------------------
IMPLEMENT_CLASS(ASlideshowStarter, false, false, false) IMPLEMENT_CLASS(ASlideshowStarter, false, false, false, false)
bool ASlideshowStarter::TryPickup (AActor *&toucher) bool ASlideshowStarter::TryPickup (AActor *&toucher)
{ {

View file

@ -72,7 +72,7 @@ public:
int TakeSpecialDamage (AActor *inflictor, AActor *source, int damage, FName damagetype); 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) int AForceFieldGuard::TakeSpecialDamage (AActor *inflictor, AActor *source, int damage, FName damagetype)
{ {
@ -197,7 +197,7 @@ public:
void Die (AActor *source, AActor *inflictor, int dmgflags); 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) 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)
//========================================================================== //==========================================================================
// //

View file

@ -184,7 +184,7 @@ public:
int DoSpecialDamage (AActor *target, int damage, FName damagetype); 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) int APoisonBolt::DoSpecialDamage (AActor *target, int damage, FName damagetype)
{ {
@ -607,7 +607,7 @@ public:
int DoSpecialDamage (AActor *target, int damage, FName damagetype); 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) int APhosphorousFire::DoSpecialDamage (AActor *target, int damage, FName damagetype)
{ {
@ -734,7 +734,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_FireGrenade)
// The Almighty Sigil! ------------------------------------------------------ // The Almighty Sigil! ------------------------------------------------------
IMPLEMENT_CLASS(ASigil, false, false, false) IMPLEMENT_CLASS(ASigil, false, false, false, false)
//============================================================================ //============================================================================
// //

View file

@ -851,7 +851,7 @@ private:
double ItemFlash; double ItemFlash;
}; };
IMPLEMENT_CLASS(DStrifeStatusBar, false, false, false); IMPLEMENT_CLASS(DStrifeStatusBar, false, false, false, false);
DBaseStatusBar *CreateStrifeStatusBar () DBaseStatusBar *CreateStrifeStatusBar ()
{ {

View file

@ -153,7 +153,7 @@ int GetSpriteIndex(const char * spritename, bool add)
return (lastindex = (int)sprites.Push (temp)); return (lastindex = (int)sprites.Push (temp));
} }
IMPLEMENT_CLASS(PClassActor, false, true, false) IMPLEMENT_CLASS(PClassActor, false, true, false, false)
IMPLEMENT_POINTERS_START(PClassActor) IMPLEMENT_POINTERS_START(PClassActor)
IMPLEMENT_POINTER(DropItems) IMPLEMENT_POINTER(DropItems)

View file

@ -54,12 +54,12 @@
FIntermissionDescriptorList IntermissionDescriptors; FIntermissionDescriptorList IntermissionDescriptors;
IMPLEMENT_CLASS(DIntermissionScreen, false, false, false) IMPLEMENT_CLASS(DIntermissionScreen, false, false, false, false)
IMPLEMENT_CLASS(DIntermissionScreenFader, false, false, false) IMPLEMENT_CLASS(DIntermissionScreenFader, false, false, false, false)
IMPLEMENT_CLASS(DIntermissionScreenText, false, false, false) IMPLEMENT_CLASS(DIntermissionScreenText, false, false, false, false)
IMPLEMENT_CLASS(DIntermissionScreenCast, false, false, false) IMPLEMENT_CLASS(DIntermissionScreenCast, false, false, false, false)
IMPLEMENT_CLASS(DIntermissionScreenScroller, false, false, false) IMPLEMENT_CLASS(DIntermissionScreenScroller, false, false, false, false)
IMPLEMENT_CLASS(DIntermissionController, false, true, false) IMPLEMENT_CLASS(DIntermissionController, false, true, false, false)
IMPLEMENT_POINTERS_START(DIntermissionController) IMPLEMENT_POINTERS_START(DIntermissionController)
IMPLEMENT_POINTER(mScreen) IMPLEMENT_POINTER(mScreen)

View file

@ -37,7 +37,7 @@
#include "cmdlib.h" #include "cmdlib.h"
#include "i_system.h" #include "i_system.h"
IMPLEMENT_CLASS(DArgs, false, false, false) IMPLEMENT_CLASS(DArgs, false, false, false, false)
//=========================================================================== //===========================================================================
// //

View file

@ -1033,7 +1033,7 @@ public:
} }
}; };
IMPLEMENT_CLASS(DSuicider, false, true, false) IMPLEMENT_CLASS(DSuicider, false, true, false, false)
IMPLEMENT_POINTERS_START(DSuicider) IMPLEMENT_POINTERS_START(DSuicider)
IMPLEMENT_POINTER(Pawn) IMPLEMENT_POINTER(Pawn)

View file

@ -331,7 +331,7 @@ public:
} }
}; };
IMPLEMENT_CLASS(DColorPickerMenu, true, false, false) IMPLEMENT_CLASS(DColorPickerMenu, true, false, false, false)
CCMD(undocolorpic) CCMD(undocolorpic)
{ {

View file

@ -236,7 +236,7 @@ class DJoystickConfigMenu : public DOptionMenu
DECLARE_CLASS(DJoystickConfigMenu, DOptionMenu) DECLARE_CLASS(DJoystickConfigMenu, DOptionMenu)
}; };
IMPLEMENT_CLASS(DJoystickConfigMenu, false, false, false) IMPLEMENT_CLASS(DJoystickConfigMenu, false, false, false, false)
//============================================================================= //=============================================================================
// //

View file

@ -42,7 +42,7 @@
#include "d_event.h" #include "d_event.h"
#include "menu/menu.h" #include "menu/menu.h"
IMPLEMENT_CLASS(DListMenu, false, false, false) IMPLEMENT_CLASS(DListMenu, false, false, false, false)
//============================================================================= //=============================================================================
// //

View file

@ -119,7 +119,7 @@ public:
}; };
IMPLEMENT_CLASS(DLoadSaveMenu, false, false, false) IMPLEMENT_CLASS(DLoadSaveMenu, false, false, false, false)
TArray<FSaveGameNode*> DLoadSaveMenu::SaveGames; TArray<FSaveGameNode*> DLoadSaveMenu::SaveGames;
int DLoadSaveMenu::LastSaved = -1; 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); bool MenuEvent (int mkey, bool fromcontroller);
}; };
IMPLEMENT_CLASS(DLoadMenu, false, false, false) IMPLEMENT_CLASS(DLoadMenu, false, false, false, false)
//============================================================================= //=============================================================================

View file

@ -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_POINTERS_START(DMenu)
IMPLEMENT_POINTER(mParentMenu) IMPLEMENT_POINTER(mParentMenu)

View file

@ -44,7 +44,7 @@
// [TP] New #includes // [TP] New #includes
#include "v_text.h" #include "v_text.h"
IMPLEMENT_CLASS(DTextEnterMenu, true, false, false) IMPLEMENT_CLASS(DTextEnterMenu, true, false, false, false)
#define INPUTGRID_WIDTH 13 #define INPUTGRID_WIDTH 13
#define INPUTGRID_HEIGHT 5 #define INPUTGRID_HEIGHT 5

View file

@ -73,7 +73,7 @@ public:
virtual void HandleResult(bool res); 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); 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); 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); 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); virtual void HandleResult(bool res);
}; };
IMPLEMENT_CLASS(DQuickLoadMenu, false, false, false) IMPLEMENT_CLASS(DQuickLoadMenu, false, false, false, false)
//============================================================================= //=============================================================================
// //

View file

@ -64,7 +64,7 @@ void M_DrawConText (int color, int x, int y, const char *str)
TAG_DONE); 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 class DCompatibilityMenu : public DOptionMenu
{ {
@ -600,4 +600,4 @@ public:
} }
}; };
IMPLEMENT_CLASS(DCompatibilityMenu, false, false, false) IMPLEMENT_CLASS(DCompatibilityMenu, false, false, false, false)

View file

@ -399,7 +399,7 @@ public:
}; };
#ifndef NO_IMP #ifndef NO_IMP
IMPLEMENT_CLASS(DEnterKey, true, false, false) IMPLEMENT_CLASS(DEnterKey, true, false, false, false)
#endif #endif
//============================================================================= //=============================================================================

View file

@ -526,7 +526,7 @@ public:
void Drawer (); void Drawer ();
}; };
IMPLEMENT_CLASS(DPlayerMenu, false, false, false) IMPLEMENT_CLASS(DPlayerMenu, false, false, false, false)
//============================================================================= //=============================================================================
// //

View file

@ -54,7 +54,7 @@ public:
bool MouseEvent(int type, int x, int y); bool MouseEvent(int type, int x, int y);
}; };
IMPLEMENT_CLASS(DReadThisMenu, false, false, false) IMPLEMENT_CLASS(DReadThisMenu, false, false, false, false)
//============================================================================= //=============================================================================
// //

View file

@ -183,7 +183,7 @@ public:
} }
}; };
IMPLEMENT_CLASS(DVideoModeMenu, false, false, false) IMPLEMENT_CLASS(DVideoModeMenu, false, false, false, false)
//============================================================================= //=============================================================================

View file

@ -1369,7 +1369,7 @@ private:
DPlaneWatcher() {} DPlaneWatcher() {}
}; };
IMPLEMENT_CLASS(DPlaneWatcher, false, true, false) IMPLEMENT_CLASS(DPlaneWatcher, false, true, false, false)
IMPLEMENT_POINTERS_START(DPlaneWatcher) IMPLEMENT_POINTERS_START(DPlaneWatcher)
IMPLEMENT_POINTER(Activator) IMPLEMENT_POINTER(Activator)
@ -2860,7 +2860,7 @@ void FBehavior::StaticStopMyScripts (AActor *actor)
//---- The ACS Interpreter ----// //---- The ACS Interpreter ----//
IMPLEMENT_CLASS(DACSThinker, false, true, false) IMPLEMENT_CLASS(DACSThinker, false, true, false, false)
IMPLEMENT_POINTERS_START(DACSThinker) IMPLEMENT_POINTERS_START(DACSThinker)
IMPLEMENT_POINTER(LastScript) 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_POINTERS_START(DLevelScript)
IMPLEMENT_POINTER(next) IMPLEMENT_POINTER(next)

View file

@ -865,7 +865,7 @@ public:
void BeginPlay (); void BeginPlay ();
}; };
IMPLEMENT_CLASS(ACustomSprite, false, false, false) IMPLEMENT_CLASS(ACustomSprite, false, false, false, false)
void ACustomSprite::BeginPlay () void ACustomSprite::BeginPlay ()
{ {

View file

@ -38,7 +38,7 @@
// //
//============================================================================ //============================================================================
IMPLEMENT_CLASS(DCeiling, false, false, false) IMPLEMENT_CLASS(DCeiling, false, false, false, false)
DCeiling::DCeiling () DCeiling::DCeiling ()
{ {

Some files were not shown because too many files have changed in this diff Show more