zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-23 12:32:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replaced the many implement macros with a single one that takes arguments instead

Browse source
This commit is contained in:
Leonard2 2016-11-05 18:27:14 +01:00
parent 0b3585c83f
commit bb2d61de50
126 changed files with 365 additions and 388 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/b_bot.cpp
View file

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

4
src/c_dispatch.cpp
View file

@ -187,7 +187,7 @@ static const char *KeyConfCommands[] =
// CODE --------------------------------------------------------------------
IMPLEMENT_CLASS (DWaitingCommand)
IMPLEMENT_CLASS(DWaitingCommand, false, false, false)
void DWaitingCommand::Serialize(FSerializer &arc)
{
@ -225,7 +225,7 @@ void DWaitingCommand::Tick ()
}
}
IMPLEMENT_CLASS (DStoredCommand)
IMPLEMENT_CLASS(DStoredCommand, false, false, false)
DStoredCommand::DStoredCommand ()
{

2
src/d_dehacked.cpp
View file

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

11
src/decallib.cpp
View file

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

39
src/dobject.h
View file

@ -160,7 +160,7 @@ protected: \
#define _IMP_PCLASS(cls, ptrs, create, initn) \
ClassReg cls::RegistrationInfo = {\
NULL, \
nullptr, \
#cls, \
&cls::Super::RegistrationInfo, \
ptrs, \
@ -171,30 +171,9 @@ protected: \
_DECLARE_TI(cls) \
PClass *cls::StaticType() const { return RegistrationInfo.MyClass; }
#define _IMP_CREATE_OBJ(cls) \
void cls::InPlaceConstructor(void *mem) { new((EInPlace *)mem) cls; }
#define IMPLEMENT_POINTY_CLASS(cls) \
_IMP_CREATE_OBJ(cls) \
_IMP_PCLASS(cls,cls::PointerOffsets,cls::InPlaceConstructor, nullptr) \
#define IMPLEMENT_POINTY_CLASS_WITH_FIELDS(cls) \
_IMP_CREATE_OBJ(cls) \
_IMP_PCLASS(cls,cls::PointerOffsets,cls::InPlaceConstructor, cls::InitNativeFields) \
#define IMPLEMENT_CLASS(cls) \
_IMP_CREATE_OBJ(cls) \
_IMP_PCLASS(cls,nullptr,cls::InPlaceConstructor, nullptr)
#define IMPLEMENT_CLASS_WITH_FIELDS(cls) \
_IMP_CREATE_OBJ(cls) \
_IMP_PCLASS(cls,nullptr,cls::InPlaceConstructor, cls::InitNativeFields)
#define IMPLEMENT_ABSTRACT_CLASS(cls) \
_IMP_PCLASS(cls,nullptr,nullptr,nullptr)
#define IMPLEMENT_ABSTRACT_POINTY_CLASS(cls) \
_IMP_PCLASS(cls,cls::PointerOffsets,nullptr,nullptr) \
#define IMPLEMENT_CLASS(cls, isabstract, ptrs, fields) \
_X_CONSTRUCTOR_##isabstract##(cls) \
_IMP_PCLASS(cls, _X_POINTERS_##ptrs##(cls), _X_ABSTRACT_##isabstract##(cls), _X_FIELDS_##fields##(cls))
// Taking the address of a field in an object at address 1 instead of
// address 0 keeps GCC from complaining about possible misuse of offsetof.
@ -202,6 +181,16 @@ protected: \
#define IMPLEMENT_POINTER(field) (size_t)&((ThisClass*)1)->field - 1,
#define IMPLEMENT_POINTERS_END ~(size_t)0 };
// Possible arguments for the IMPLEMENT_CLASS macro
#define _X_POINTERS_true(cls) cls::PointerOffsets
#define _X_POINTERS_false(cls) nullptr
#define _X_FIELDS_true(cls) cls::InitNativeFields
#define _X_FIELDS_false(cls) nullptr
#define _X_CONSTRUCTOR_true(cls)
#define _X_CONSTRUCTOR_false(cls) void cls::InPlaceConstructor(void *mem) { new((EInPlace *)mem) cls; }
#define _X_ABSTRACT_true(cls) nullptr
#define _X_ABSTRACT_false(cls) cls::InPlaceConstructor
enum EObjectFlags
{
// GC flags

3
src/dobjgc.cpp
View file

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

73
src/dobjtype.cpp
View file

@ -93,8 +93,8 @@ static const size_t TheEnd = ~(size_t)0;
// CODE --------------------------------------------------------------------
IMPLEMENT_CLASS(PErrorType)
IMPLEMENT_CLASS(PVoidType)
IMPLEMENT_CLASS(PErrorType, false, false, false)
IMPLEMENT_CLASS(PVoidType, false, false, false)
void DumpTypeTable()
{
@ -141,7 +141,7 @@ void DumpTypeTable()
/* PClassType *************************************************************/
IMPLEMENT_CLASS(PClassType)
IMPLEMENT_CLASS(PClassType, false, false, false)
//==========================================================================
//
@ -169,7 +169,7 @@ void PClassType::Derive(PClass *newclass)
/* PClassClass ************************************************************/
IMPLEMENT_CLASS(PClassClass)
IMPLEMENT_CLASS(PClassClass, false, false, false)
//==========================================================================
//
@ -187,7 +187,7 @@ PClassClass::PClassClass()
/* PType ******************************************************************/
IMPLEMENT_ABSTRACT_POINTY_CLASS(PType)
IMPLEMENT_CLASS(PType, true, true, false)
IMPLEMENT_POINTERS_START(PType)
IMPLEMENT_POINTER(HashNext)
@ -614,7 +614,7 @@ void PType::StaticInit()
/* PBasicType *************************************************************/
IMPLEMENT_ABSTRACT_CLASS(PBasicType)
IMPLEMENT_CLASS(PBasicType, true, false, false)
//==========================================================================
//
@ -640,11 +640,11 @@ PBasicType::PBasicType(unsigned int size, unsigned int align)
/* PCompoundType **********************************************************/
IMPLEMENT_ABSTRACT_CLASS(PCompoundType)
IMPLEMENT_CLASS(PCompoundType, true, false, false)
/* PNamedType *************************************************************/
IMPLEMENT_ABSTRACT_POINTY_CLASS(PNamedType)
IMPLEMENT_CLASS(PNamedType, true, true, false)
IMPLEMENT_POINTERS_START(PNamedType)
IMPLEMENT_POINTER(Outer)
@ -692,7 +692,7 @@ FString PNamedType::QualifiedName() const
/* PInt *******************************************************************/
IMPLEMENT_CLASS(PInt)
IMPLEMENT_CLASS(PInt, false, false, false)
//==========================================================================
//
@ -931,7 +931,7 @@ double PInt::GetValueFloat(void *addr) const
/* PBool ******************************************************************/
IMPLEMENT_CLASS(PBool)
IMPLEMENT_CLASS(PBool, false, false, false)
//==========================================================================
//
@ -952,7 +952,7 @@ PBool::PBool()
/* PFloat *****************************************************************/
IMPLEMENT_CLASS(PFloat)
IMPLEMENT_CLASS(PFloat, false, false, false)
//==========================================================================
//
@ -1202,7 +1202,7 @@ void PFloat::SetOps()
/* PString ****************************************************************/
IMPLEMENT_CLASS(PString)
IMPLEMENT_CLASS(PString, false, false, false)
//==========================================================================
//
@ -1299,7 +1299,7 @@ void PString::DestroyValue(void *addr) const
/* PName ******************************************************************/
IMPLEMENT_CLASS(PName)
IMPLEMENT_CLASS(PName, false, false, false)
//==========================================================================
//
@ -1349,7 +1349,7 @@ bool PName::ReadValue(FSerializer &ar, const char *key, void *addr) const
/* PSound *****************************************************************/
IMPLEMENT_CLASS(PSound)
IMPLEMENT_CLASS(PSound, false, false, false)
//==========================================================================
//
@ -1399,7 +1399,7 @@ bool PSound::ReadValue(FSerializer &ar, const char *key, void *addr) const
/* PColor *****************************************************************/
IMPLEMENT_CLASS(PColor)
IMPLEMENT_CLASS(PColor, false, false, false)
//==========================================================================
//
@ -1416,7 +1416,7 @@ PColor::PColor()
/* PStatePointer **********************************************************/
IMPLEMENT_CLASS(PStatePointer)
IMPLEMENT_CLASS(PStatePointer, false, false, false)
//==========================================================================
//
@ -1460,7 +1460,7 @@ bool PStatePointer::ReadValue(FSerializer &ar, const char *key, void *addr) cons
/* PPointer ***************************************************************/
IMPLEMENT_POINTY_CLASS(PPointer)
IMPLEMENT_CLASS(PPointer, false, true, false)
IMPLEMENT_POINTERS_START(PPointer)
IMPLEMENT_POINTER(PointedType)
@ -1591,7 +1591,7 @@ PPointer *NewPointer(PType *type, bool isconst)
/* PClassPointer **********************************************************/
IMPLEMENT_POINTY_CLASS(PClassPointer)
IMPLEMENT_CLASS(PClassPointer, false, true, false)
IMPLEMENT_POINTERS_START(PClassPointer)
IMPLEMENT_POINTER(ClassRestriction)
@ -1672,7 +1672,7 @@ PClassPointer *NewClassPointer(PClass *restrict)
/* PEnum ******************************************************************/
IMPLEMENT_POINTY_CLASS(PEnum)
IMPLEMENT_CLASS(PEnum, false, true, false)
IMPLEMENT_POINTERS_START(PEnum)
IMPLEMENT_POINTER(ValueType)
@ -1725,7 +1725,7 @@ PEnum *NewEnum(FName name, PTypeBase *outer)
/* PArray *****************************************************************/
IMPLEMENT_POINTY_CLASS(PArray)
IMPLEMENT_CLASS(PArray, false, true, false)
IMPLEMENT_POINTERS_START(PArray)
IMPLEMENT_POINTER(ElementType)
@ -1874,7 +1874,7 @@ PArray *NewArray(PType *type, unsigned int count)
/* PVector ****************************************************************/
IMPLEMENT_CLASS(PVector)
IMPLEMENT_CLASS(PVector, false, false, false)
//==========================================================================
//
@ -1924,7 +1924,7 @@ PVector *NewVector(unsigned int size)
/* PDynArray **************************************************************/
IMPLEMENT_POINTY_CLASS(PDynArray)
IMPLEMENT_CLASS(PDynArray, false, true, false)
IMPLEMENT_POINTERS_START(PDynArray)
IMPLEMENT_POINTER(ElementType)
@ -2007,7 +2007,7 @@ PDynArray *NewDynArray(PType *type)
/* PMap *******************************************************************/
IMPLEMENT_POINTY_CLASS(PMap)
IMPLEMENT_CLASS(PMap, false, true, false)
IMPLEMENT_POINTERS_START(PMap)
IMPLEMENT_POINTER(KeyType)
@ -2091,7 +2091,7 @@ PMap *NewMap(PType *keytype, PType *valuetype)
/* PStruct ****************************************************************/
IMPLEMENT_CLASS(PStruct)
IMPLEMENT_CLASS(PStruct, false, false, false)
//==========================================================================
//
@ -2312,7 +2312,7 @@ PStruct *NewStruct(FName name, PTypeBase *outer)
/* PField *****************************************************************/
IMPLEMENT_CLASS(PField)
IMPLEMENT_CLASS(PField, false, false, false)
//==========================================================================
//
@ -2357,7 +2357,7 @@ PField::PField(FName name, PType *type, DWORD flags, size_t offset, int bitvalue
/* PPrototype *************************************************************/
IMPLEMENT_CLASS(PPrototype)
IMPLEMENT_CLASS(PPrototype, false, false, false)
//==========================================================================
//
@ -2443,7 +2443,7 @@ PPrototype *NewPrototype(const TArray<PType *> &rettypes, const TArray<PType *>
/* PFunction **************************************************************/
IMPLEMENT_CLASS(PFunction)
IMPLEMENT_CLASS(PFunction, false, false, false)
//==========================================================================
//
@ -2501,7 +2501,7 @@ unsigned PFunction::AddVariant(PPrototype *proto, TArray<DWORD> &argflags, TArra
/* PClass *****************************************************************/
IMPLEMENT_POINTY_CLASS(PClass)
IMPLEMENT_CLASS(PClass, false, true, false)
IMPLEMENT_POINTERS_START(PClass)
IMPLEMENT_POINTER(ParentClass)
@ -3420,24 +3420,23 @@ CCMD(typetable)
// Symbol tables ------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(PTypeBase);
IMPLEMENT_ABSTRACT_CLASS(PSymbol);
IMPLEMENT_CLASS(PSymbolConst);
IMPLEMENT_CLASS(PSymbolConstNumeric);
IMPLEMENT_CLASS(PSymbolConstString);
IMPLEMENT_POINTY_CLASS(PSymbolType)
IMPLEMENT_CLASS(PTypeBase, true, false, false);
IMPLEMENT_CLASS(PSymbol, true, false, false);
IMPLEMENT_CLASS(PSymbolConst, false, false, false);
IMPLEMENT_CLASS(PSymbolConstNumeric, false, false, false);
IMPLEMENT_CLASS(PSymbolConstString, false, false, false);
IMPLEMENT_CLASS(PSymbolTreeNode, false, false, false)
IMPLEMENT_CLASS(PSymbolType, false, true, false)
IMPLEMENT_POINTERS_START(PSymbolType)
IMPLEMENT_POINTER(Type)
IMPLEMENT_POINTERS_END
IMPLEMENT_POINTY_CLASS(PSymbolVMFunction)
IMPLEMENT_CLASS(PSymbolVMFunction, false, true, false)
IMPLEMENT_POINTERS_START(PSymbolVMFunction)
IMPLEMENT_POINTER(Function)
IMPLEMENT_POINTERS_END
IMPLEMENT_CLASS(PSymbolTreeNode)
//==========================================================================
//

10
src/dsectoreffect.cpp
View file

@ -31,7 +31,7 @@
#include "serializer.h"
#include "doomstat.h"
IMPLEMENT_CLASS (DSectorEffect)
IMPLEMENT_CLASS(DSectorEffect, false, false, false)
DSectorEffect::DSectorEffect ()
: DThinker(STAT_SECTOREFFECT)
@ -71,7 +71,7 @@ void DSectorEffect::Serialize(FSerializer &arc)
arc("sector", m_Sector);
}
IMPLEMENT_POINTY_CLASS(DMover)
IMPLEMENT_CLASS(DMover, false, true, false)
IMPLEMENT_POINTERS_START(DMover)
IMPLEMENT_POINTER(interpolation)
@ -108,9 +108,7 @@ void DMover::StopInterpolation(bool force)
}
}
IMPLEMENT_CLASS (DMovingFloor)
IMPLEMENT_CLASS(DMovingFloor, false, false, false)
DMovingFloor::DMovingFloor ()
{
@ -123,7 +121,7 @@ DMovingFloor::DMovingFloor (sector_t *sector)
interpolation = sector->SetInterpolation(sector_t::FloorMove, true);
}
IMPLEMENT_CLASS (DMovingCeiling)
IMPLEMENT_CLASS(DMovingCeiling, false, false, false)
DMovingCeiling::DMovingCeiling ()
{

4
src/dthinker.cpp
View file

@ -47,7 +47,7 @@ extern cycle_t BotSupportCycles;
extern cycle_t ActionCycles;
extern int BotWTG;
IMPLEMENT_CLASS (DThinker)
IMPLEMENT_CLASS(DThinker, false, false, false)
DThinker *NextToThink;
@ -538,7 +538,7 @@ public:
}
};
IMPLEMENT_CLASS(DThinkerIterator);
IMPLEMENT_CLASS(DThinkerIterator, false, false, false);
DEFINE_ACTION_FUNCTION(DThinkerIterator, Create)
{
PARAM_PROLOGUE;

4
src/fragglescript/t_func.cpp
View file

@ -1785,9 +1785,7 @@ public:
void Destroy() { Super::Destroy(); m_Sector->lightingdata=NULL; }
};
IMPLEMENT_CLASS (DLightLevel)
IMPLEMENT_CLASS(DLightLevel, false, false, false)
void DLightLevel::Serialize(FSerializer &arc)
{

2
src/fragglescript/t_prepro.cpp
View file

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

6
src/fragglescript/t_script.cpp
View file

@ -99,7 +99,7 @@ AActor *trigger_obj;
//
//==========================================================================
IMPLEMENT_POINTY_CLASS(DFsScript)
IMPLEMENT_CLASS(DFsScript, false, true, false)
IMPLEMENT_POINTERS_START(DFsScript)
IMPLEMENT_POINTER(parent)
@ -269,7 +269,7 @@ void DFsScript::ParseScript(char *position)
//
//==========================================================================
IMPLEMENT_POINTY_CLASS(DRunningScript)
IMPLEMENT_CLASS(DRunningScript, false, true, false)
IMPLEMENT_POINTERS_START(DRunningScript)
IMPLEMENT_POINTER(prev)
@ -380,7 +380,7 @@ void DRunningScript::Serialize(FSerializer &arc)
//
//==========================================================================
IMPLEMENT_POINTY_CLASS(DFraggleThinker)
IMPLEMENT_CLASS(DFraggleThinker, false, true, false)
IMPLEMENT_POINTERS_START(DFraggleThinker)
IMPLEMENT_POINTER(RunningScripts)

2
src/fragglescript/t_variable.cpp
View file

@ -179,7 +179,7 @@ AActor* actorvalue(const svalue_t &svalue)
//
//==========================================================================
IMPLEMENT_POINTY_CLASS(DFsVariable)
IMPLEMENT_CLASS(DFsVariable, false, true, false)
IMPLEMENT_POINTERS_START(DFsVariable)
IMPLEMENT_POINTER(next)

2
src/g_doom/a_scriptedmarine.cpp
View file

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

2
src/g_heretic/a_chicken.cpp
View file

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

6
src/g_heretic/a_hereticartifacts.cpp
View file

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

21
src/g_heretic/a_hereticweaps.cpp
View file

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

2
src/g_heretic/a_ironlich.cpp
View file

@ -22,7 +22,7 @@ public:
int DoSpecialDamage (AActor *target, int damage, FName damagetype);
};
IMPLEMENT_CLASS(AWhirlwind)
IMPLEMENT_CLASS(AWhirlwind, false, false, false)
int AWhirlwind::DoSpecialDamage (AActor *target, int damage, FName damagetype)
{

2
src/g_hexen/a_boostarmor.cpp
View file

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

2
src/g_hexen/a_clericflame.cpp
View file

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

4
src/g_hexen/a_clericholy.cpp
View file

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

2
src/g_hexen/a_clericstaff.cpp
View file

@ -25,7 +25,7 @@ public:
int DoSpecialDamage (AActor *target, int damage, FName damagetype);
};
IMPLEMENT_CLASS (ACStaffMissile)
IMPLEMENT_CLASS(ACStaffMissile, false, false, false)
int ACStaffMissile::DoSpecialDamage (AActor *target, int damage, FName damagetype)
{

2
src/g_hexen/a_fighteraxe.cpp
View file

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

6
src/g_hexen/a_fighterplayer.cpp
View file

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

2
src/g_hexen/a_fighterquietus.cpp
View file

@ -59,7 +59,7 @@ public:
int DoSpecialDamage(AActor *victim, int damage, FName damagetype);
};
IMPLEMENT_CLASS (AFSwordMissile)
IMPLEMENT_CLASS(AFSwordMissile, false, false, false)
int AFSwordMissile::DoSpecialDamage(AActor *victim, int damage, FName damagetype)
{

14
src/g_hexen/a_flechette.cpp
View file

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

2
src/g_hexen/a_healingradius.cpp
View file

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

10
src/g_hexen/a_heresiarch.cpp
View file

@ -72,7 +72,7 @@ public:
void Die (AActor *source, AActor *inflictor, int dmgflags);
};
IMPLEMENT_CLASS (AHeresiarch)
IMPLEMENT_CLASS(AHeresiarch, false, false, false)
void AHeresiarch::Serialize(FSerializer &arc)
{
@ -122,7 +122,7 @@ public:
}
};
IMPLEMENT_CLASS (ASorcBall)
IMPLEMENT_CLASS(ASorcBall, false, false, false)
// First ball (purple) - fires projectiles ----------------------------------
@ -140,7 +140,7 @@ public:
virtual void CastSorcererSpell ();
};
IMPLEMENT_CLASS (ASorcBall1)
IMPLEMENT_CLASS(ASorcBall1, false, false, false)
// Second ball (blue) - generates the shield --------------------------------
@ -156,7 +156,7 @@ public:
virtual void CastSorcererSpell ();
};
IMPLEMENT_CLASS (ASorcBall2)
IMPLEMENT_CLASS(ASorcBall2, false, false, false)
// Third ball (green) - summons Bishops -------------------------------------
@ -172,7 +172,7 @@ public:
virtual void CastSorcererSpell ();
};
IMPLEMENT_CLASS (ASorcBall3)
IMPLEMENT_CLASS(ASorcBall3, false, false, false)
// Sorcerer spell 1 (The burning, bouncing head thing) ----------------------

6
src/g_hexen/a_hexenspecialdecs.cpp
View file

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

2
src/g_hexen/a_magecone.cpp
View file

@ -32,7 +32,7 @@ public:
int DoSpecialDamage (AActor *victim, int damage, FName damagetype);
};
IMPLEMENT_CLASS (AFrostMissile)
IMPLEMENT_CLASS(AFrostMissile, false, false, false)
int AFrostMissile::DoSpecialDamage (AActor *victim, int damage, FName damagetype)
{

4
src/g_hexen/a_magelightning.cpp
View file

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

4
src/g_hexen/a_magestaff.cpp
View file

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

2
src/g_hexen/a_pig.cpp
View file

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

2
src/g_hexen/a_spike.cpp
View file

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

2
src/g_hexen/a_summon.cpp
View file

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

4
src/g_hexen/a_teleportother.cpp
View file

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

2
src/g_level.cpp
View file

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

2
src/g_raven/a_artitele.cpp
View file

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

4
src/g_raven/a_minotaur.cpp
View file

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

6
src/g_shared/a_action.cpp
View file

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

11
src/g_shared/a_armor.cpp
View file

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

54
src/g_shared/a_artifacts.cpp
View file

@ -40,11 +40,11 @@ static FRandom pr_torch ("Torch");
#define TIMEFREEZE_TICS ( 12 * TICRATE )
*/
IMPLEMENT_CLASS (APowerup)
IMPLEMENT_CLASS(APowerup, false, false, false)
// Powerup-Giver -------------------------------------------------------------
IMPLEMENT_CLASS(PClassPowerupGiver)
IMPLEMENT_CLASS(PClassPowerupGiver, false, false, false)
void PClassPowerupGiver::ReplaceClassRef(PClass *oldclass, PClass *newclass)
{
@ -376,7 +376,7 @@ bool APowerup::GetNoTeleportFreeze ()
// Invulnerability Powerup ---------------------------------------------------
IMPLEMENT_CLASS (APowerInvulnerable)
IMPLEMENT_CLASS(APowerInvulnerable, false, false, false)
//===========================================================================
//
@ -513,7 +513,7 @@ int APowerInvulnerable::AlterWeaponSprite (visstyle_t *vis)
// Strength (aka Berserk) Powerup --------------------------------------------
IMPLEMENT_CLASS (APowerStrength)
IMPLEMENT_CLASS(APowerStrength, false, false, false)
//===========================================================================
//
@ -578,7 +578,7 @@ PalEntry APowerStrength::GetBlend ()
// Invisibility Powerup ------------------------------------------------------
IMPLEMENT_CLASS (APowerInvisibility)
IMPLEMENT_CLASS(APowerInvisibility, false, false, false)
// Invisibility flag combos
#define INVISIBILITY_FLAGS1 (MF_SHADOW)
@ -783,7 +783,7 @@ bool APowerInvisibility::HandlePickup (AInventory *item)
// Ironfeet Powerup ----------------------------------------------------------
IMPLEMENT_CLASS (APowerIronFeet)
IMPLEMENT_CLASS(APowerIronFeet, false, false, false)
//===========================================================================
//
@ -820,7 +820,7 @@ void APowerIronFeet::DoEffect ()
// Strife Environment Suit Powerup -------------------------------------------
IMPLEMENT_CLASS (APowerMask)
IMPLEMENT_CLASS(APowerMask, false, false, false)
//===========================================================================
//
@ -857,7 +857,7 @@ void APowerMask::DoEffect ()
// Light-Amp Powerup ---------------------------------------------------------
IMPLEMENT_CLASS (APowerLightAmp)
IMPLEMENT_CLASS(APowerLightAmp, false, false, false)
//===========================================================================
//
@ -899,7 +899,7 @@ void APowerLightAmp::EndEffect ()
// Torch Powerup -------------------------------------------------------------
IMPLEMENT_CLASS (APowerTorch)
IMPLEMENT_CLASS(APowerTorch, false, false, false)
//===========================================================================
//
@ -962,7 +962,7 @@ void APowerTorch::DoEffect ()
// Flight (aka Wings of Wrath) powerup ---------------------------------------
IMPLEMENT_CLASS (APowerFlight)
IMPLEMENT_CLASS(APowerFlight, false, false, false)
//===========================================================================
//
@ -1102,7 +1102,7 @@ bool APowerFlight::DrawPowerup (int x, int y)
// Weapon Level 2 (aka Tome of Power) Powerup --------------------------------
IMPLEMENT_CLASS (APowerWeaponLevel2)
IMPLEMENT_CLASS(APowerWeaponLevel2, false, false, false)
//===========================================================================
//
@ -1193,7 +1193,7 @@ public:
void Tick ();
};
IMPLEMENT_CLASS (APlayerSpeedTrail)
IMPLEMENT_CLASS(APlayerSpeedTrail, false, false, false)
//===========================================================================
//
@ -1216,7 +1216,7 @@ void APlayerSpeedTrail::Tick ()
// Speed Powerup -------------------------------------------------------------
IMPLEMENT_CLASS (APowerSpeed)
IMPLEMENT_CLASS(APowerSpeed, false, false, false)
//===========================================================================
//
@ -1303,11 +1303,11 @@ void APowerSpeed::DoEffect ()
// Minotaur (aka Dark Servant) powerup ---------------------------------------
IMPLEMENT_CLASS (APowerMinotaur)
IMPLEMENT_CLASS(APowerMinotaur, false, false, false)
// Targeter powerup ---------------------------------------------------------
IMPLEMENT_CLASS (APowerTargeter)
IMPLEMENT_CLASS(APowerTargeter, false, false, false)
void APowerTargeter::Travelled ()
{
@ -1422,7 +1422,7 @@ void APowerTargeter::PositionAccuracy ()
// Frightener Powerup --------------------------------
IMPLEMENT_CLASS (APowerFrightener)
IMPLEMENT_CLASS(APowerFrightener, false, false, false)
//===========================================================================
//
@ -1458,7 +1458,7 @@ void APowerFrightener::EndEffect ()
// Buddha Powerup --------------------------------
IMPLEMENT_CLASS (APowerBuddha)
IMPLEMENT_CLASS(APowerBuddha, false, false, false)
//===========================================================================
//
@ -1494,11 +1494,11 @@ void APowerBuddha::EndEffect ()
// Scanner powerup ----------------------------------------------------------
IMPLEMENT_CLASS (APowerScanner)
IMPLEMENT_CLASS(APowerScanner, false, false, false)
// Time freezer powerup -----------------------------------------------------
IMPLEMENT_CLASS( APowerTimeFreezer)
IMPLEMENT_CLASS( APowerTimeFreezer, false, false, false)
//===========================================================================
//
@ -1625,7 +1625,7 @@ void APowerTimeFreezer::EndEffect()
// Damage powerup ------------------------------------------------------
IMPLEMENT_CLASS(APowerDamage)
IMPLEMENT_CLASS(APowerDamage, false, false, false)
//===========================================================================
//
@ -1682,7 +1682,7 @@ void APowerDamage::ModifyDamage(int damage, FName damageType, int &newdamage, bo
// Quarter damage powerup ------------------------------------------------------
IMPLEMENT_CLASS(APowerProtection)
IMPLEMENT_CLASS(APowerProtection, false, false, false)
#define PROTECTION_FLAGS3 (MF3_NORADIUSDMG | MF3_DONTMORPH | MF3_DONTSQUASH | MF3_DONTBLAST | MF3_NOTELEOTHER)
#define PROTECTION_FLAGS5 (MF5_NOPAIN | MF5_DONTRIP)
@ -1760,7 +1760,7 @@ void APowerProtection::ModifyDamage(int damage, FName damageType, int &newdamage
// Drain rune -------------------------------------------------------
IMPLEMENT_CLASS(APowerDrain)
IMPLEMENT_CLASS(APowerDrain, false, false, false)
//===========================================================================
//
@ -1800,7 +1800,7 @@ void APowerDrain::EndEffect( )
// Regeneration rune -------------------------------------------------------
IMPLEMENT_CLASS(APowerRegeneration)
IMPLEMENT_CLASS(APowerRegeneration, false, false, false)
//===========================================================================
//
@ -1822,7 +1822,7 @@ void APowerRegeneration::DoEffect()
// High jump rune -------------------------------------------------------
IMPLEMENT_CLASS(APowerHighJump)
IMPLEMENT_CLASS(APowerHighJump, false, false, false)
//===========================================================================
//
@ -1860,7 +1860,7 @@ void APowerHighJump::EndEffect( )
// Double firing speed rune ---------------------------------------------
IMPLEMENT_CLASS(APowerDoubleFiringSpeed)
IMPLEMENT_CLASS(APowerDoubleFiringSpeed, false, false, false)
//===========================================================================
//
@ -1898,7 +1898,7 @@ void APowerDoubleFiringSpeed::EndEffect( )
// Morph powerup ------------------------------------------------------
IMPLEMENT_CLASS(APowerMorph)
IMPLEMENT_CLASS(APowerMorph, false, false, false)
//===========================================================================
//
@ -2002,7 +2002,7 @@ void APowerMorph::EndEffect( )
// Infinite Ammo Powerup -----------------------------------------------------
IMPLEMENT_CLASS(APowerInfiniteAmmo)
IMPLEMENT_CLASS(APowerInfiniteAmmo, false, false, false)
//===========================================================================
//

4
src/g_shared/a_bridge.cpp
View file

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

4
src/g_shared/a_camera.cpp
View file

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

2
src/g_shared/a_debris.cpp
View file

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

6
src/g_shared/a_decals.cpp
View file

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

3
src/g_shared/a_fastprojectile.cpp
View file

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

2
src/g_shared/a_flashfader.cpp
View file

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

2
src/g_shared/a_fountain.cpp
View file

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

2
src/g_shared/a_hatetarget.cpp
View file

@ -46,7 +46,7 @@ public:
int TakeSpecialDamage(AActor *inflictor, AActor *source, int damage, FName damagetype);
};
IMPLEMENT_CLASS(AHateTarget)
IMPLEMENT_CLASS(AHateTarget, false, false, false)
void AHateTarget::BeginPlay()
{

2
src/g_shared/a_keys.cpp
View file

@ -470,7 +470,7 @@ bool P_CheckKeys (AActor *owner, int keynum, bool remote)
//
//==========================================================================
IMPLEMENT_CLASS (AKey)
IMPLEMENT_CLASS(AKey, false, false, false)
bool AKey::HandlePickup (AInventory *item)
{

2
src/g_shared/a_lightning.cpp
View file

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

2
src/g_shared/a_mapmarker.cpp
View file

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

4
src/g_shared/a_morph.cpp
View file

@ -616,7 +616,7 @@ void InitAllPowerupEffects(AInventory *item)
// Base class for morphing projectiles --------------------------------------
IMPLEMENT_CLASS(AMorphProjectile)
IMPLEMENT_CLASS(AMorphProjectile, false, false, false)
int AMorphProjectile::DoSpecialDamage (AActor *target, int damage, FName damagetype)
{
@ -650,7 +650,7 @@ void AMorphProjectile::Serialize(FSerializer &arc)
// Morphed Monster (you must subclass this to do something useful) ---------
IMPLEMENT_POINTY_CLASS(AMorphedMonster)
IMPLEMENT_CLASS(AMorphedMonster, false, true, false)
IMPLEMENT_POINTERS_START(AMorphedMonster)
IMPLEMENT_POINTER(UnmorphedMe)

10
src/g_shared/a_movingcamera.cpp
View file

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

27
src/g_shared/a_pickups.cpp
View file

@ -24,7 +24,7 @@
static FRandom pr_restore ("RestorePos");
IMPLEMENT_CLASS(PClassInventory)
IMPLEMENT_CLASS(PClassInventory, false, false, false)
PClassInventory::PClassInventory()
{
@ -71,7 +71,7 @@ void PClassInventory::Finalize(FStateDefinitions &statedef)
((AActor*)Defaults)->flags |= MF_SPECIAL;
}
IMPLEMENT_CLASS(PClassAmmo)
IMPLEMENT_CLASS(PClassAmmo, false, false, false)
PClassAmmo::PClassAmmo()
{
@ -87,7 +87,7 @@ void PClassAmmo::DeriveData(PClass *newclass)
newc->DropAmount = DropAmount;
}
IMPLEMENT_CLASS (AAmmo)
IMPLEMENT_CLASS(AAmmo, false, false, false)
//===========================================================================
//
@ -470,7 +470,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_RestoreSpecialPosition)
int AInventory::StaticLastMessageTic;
const char *AInventory::StaticLastMessage;
IMPLEMENT_POINTY_CLASS(AInventory)
IMPLEMENT_CLASS(AInventory, false, true, false)
IMPLEMENT_POINTERS_START(AInventory)
IMPLEMENT_POINTER(Owner)
@ -1354,7 +1354,7 @@ bool AInventory::DrawPowerup (int x, int y)
/* AArtifact implementation */
/***************************************************************************/
IMPLEMENT_CLASS (APowerupGiver)
IMPLEMENT_CLASS(APowerupGiver, false, false, false)
//===========================================================================
//
@ -1644,8 +1644,8 @@ void AInventory::DetachFromOwner ()
{
}
IMPLEMENT_CLASS(AStateProvider)
IMPLEMENT_CLASS (ACustomInventory)
IMPLEMENT_CLASS(AStateProvider, false, false, false)
IMPLEMENT_CLASS(ACustomInventory, false, false, false)
//===========================================================================
//
@ -1690,7 +1690,7 @@ bool ACustomInventory::TryPickup (AActor *&toucher)
return useok;
}
IMPLEMENT_CLASS(PClassHealth)
IMPLEMENT_CLASS(PClassHealth, false, false, false)
//===========================================================================
//
@ -1719,7 +1719,7 @@ void PClassHealth::DeriveData(PClass *newclass)
newc->LowHealthMessage = LowHealthMessage;
}
IMPLEMENT_CLASS (AHealth)
IMPLEMENT_CLASS(AHealth, false, false, false)
//===========================================================================
//
@ -1762,7 +1762,7 @@ bool AHealth::TryPickup (AActor *&other)
return false;
}
IMPLEMENT_CLASS (AHealthPickup)
IMPLEMENT_CLASS(AHealthPickup, false, false, false)
//===========================================================================
//
@ -2015,9 +2015,8 @@ void ABackpackItem::DetachFromOwner ()
//
//===========================================================================
IMPLEMENT_CLASS(ABackpackItem)
IMPLEMENT_CLASS (AMapRevealer)
IMPLEMENT_CLASS(ABackpackItem, false, false, false)
IMPLEMENT_CLASS(AMapRevealer, false, false, false)
//===========================================================================
//
@ -2042,7 +2041,7 @@ bool AMapRevealer::TryPickup (AActor *&toucher)
//
//===========================================================================
IMPLEMENT_CLASS(AScoreItem)
IMPLEMENT_CLASS(AScoreItem, false, false, false)
//===========================================================================
//

4
src/g_shared/a_puzzleitems.cpp
View file

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

2
src/g_shared/a_quake.cpp
View file

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

2
src/g_shared/a_randomspawner.cpp
View file

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

2
src/g_shared/a_secrettrigger.cpp
View file

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

25
src/g_shared/a_sectoraction.cpp
View file

@ -37,7 +37,7 @@
// The base class for sector actions ----------------------------------------
IMPLEMENT_CLASS (ASectorAction)
IMPLEMENT_CLASS(ASectorAction, false, false, false)
ASectorAction::ASectorAction (bool activatedByUse) :
ActivatedByUse (activatedByUse) {}
@ -142,7 +142,7 @@ public:
bool DoTriggerAction (AActor *triggerer, int activationType);
};
IMPLEMENT_CLASS (ASecActEnter)
IMPLEMENT_CLASS(ASecActEnter, false, false, false)
bool ASecActEnter::DoTriggerAction (AActor *triggerer, int activationType)
@ -160,7 +160,7 @@ public:
bool DoTriggerAction (AActor *triggerer, int activationType);
};
IMPLEMENT_CLASS (ASecActExit)
IMPLEMENT_CLASS(ASecActExit, false, false, false)
bool ASecActExit::DoTriggerAction (AActor *triggerer, int activationType)
@ -180,7 +180,8 @@ public:
// Skull Tag uses 9999 for a special that is triggered whenever
// the player is on the sector's floor. I think this is more useful.
IMPLEMENT_CLASS (ASecActHitFloor)
IMPLEMENT_CLASS(ASecActHitFloor, false, false, false)
bool ASecActHitFloor::DoTriggerAction (AActor *triggerer, int activationType)
@ -198,7 +199,7 @@ public:
bool DoTriggerAction (AActor *triggerer, int activationType);
};
IMPLEMENT_CLASS (ASecActHitCeil)
IMPLEMENT_CLASS(ASecActHitCeil, false, false, false)
bool ASecActHitCeil::DoTriggerAction (AActor *triggerer, int activationType)
@ -217,7 +218,7 @@ public:
bool DoTriggerAction (AActor *triggerer, int activationType);
};
IMPLEMENT_CLASS (ASecActUse)
IMPLEMENT_CLASS(ASecActUse, false, false, false)
bool ASecActUse::DoTriggerAction (AActor *triggerer, int activationType)
@ -236,7 +237,7 @@ public:
bool DoTriggerAction (AActor *triggerer, int activationType);
};
IMPLEMENT_CLASS (ASecActUseWall)
IMPLEMENT_CLASS(ASecActUseWall, false, false, false)
bool ASecActUseWall::DoTriggerAction (AActor *triggerer, int activationType)
@ -254,7 +255,7 @@ public:
bool DoTriggerAction (AActor *triggerer, int activationType);
};
IMPLEMENT_CLASS (ASecActEyesDive)
IMPLEMENT_CLASS(ASecActEyesDive, false, false, false)
bool ASecActEyesDive::DoTriggerAction (AActor *triggerer, int activationType)
@ -272,7 +273,7 @@ public:
bool DoTriggerAction (AActor *triggerer, int activationType);
};
IMPLEMENT_CLASS (ASecActEyesSurface)
IMPLEMENT_CLASS(ASecActEyesSurface, false, false, false)
bool ASecActEyesSurface::DoTriggerAction (AActor *triggerer, int activationType)
@ -290,7 +291,7 @@ public:
bool DoTriggerAction (AActor *triggerer, int activationType);
};
IMPLEMENT_CLASS (ASecActEyesBelowC)
IMPLEMENT_CLASS(ASecActEyesBelowC, false, false, false)
bool ASecActEyesBelowC::DoTriggerAction (AActor *triggerer, int activationType)
@ -308,7 +309,7 @@ public:
bool DoTriggerAction (AActor *triggerer, int activationType);
};
IMPLEMENT_CLASS (ASecActEyesAboveC)
IMPLEMENT_CLASS(ASecActEyesAboveC, false, false, false)
bool ASecActEyesAboveC::DoTriggerAction (AActor *triggerer, int activationType)
@ -326,7 +327,7 @@ public:
bool DoTriggerAction (AActor *triggerer, int activationType);
};
IMPLEMENT_CLASS (ASecActHitFakeFloor)
IMPLEMENT_CLASS(ASecActHitFakeFloor, false, false, false)
bool ASecActHitFakeFloor::DoTriggerAction (AActor *triggerer, int activationType)

4
src/g_shared/a_setcolor.cpp
View file

@ -15,7 +15,7 @@ class AColorSetter : public AActor
};
IMPLEMENT_CLASS(AColorSetter)
IMPLEMENT_CLASS(AColorSetter, false, false, false)
class AFadeSetter : public AActor
{
@ -30,4 +30,4 @@ class AFadeSetter : public AActor
};
IMPLEMENT_CLASS(AFadeSetter)
IMPLEMENT_CLASS(AFadeSetter, false, false, false)

12
src/g_shared/a_skies.cpp
View file

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

2
src/g_shared/a_soundenvironment.cpp
View file

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

4
src/g_shared/a_soundsequence.cpp
View file

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

2
src/g_shared/a_spark.cpp
View file

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

5
src/g_shared/a_specialspot.cpp
View file

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

2
src/g_shared/a_waterzone.cpp
View file

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

6
src/g_shared/a_weaponpiece.cpp
View file

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

6
src/g_shared/a_weapons.cpp
View file

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

8
src/g_shared/hudmessages.cpp
View file

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

2
src/g_shared/sbarinfo.cpp
View file

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

2
src/g_shared/shared_sbar.cpp
View file

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

2
src/g_strife/a_coin.cpp
View file

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

2
src/g_strife/a_loremaster.cpp
View file

@ -17,7 +17,7 @@ public:
int DoSpecialDamage (AActor *victim, int damage, FName damagetype);
};
IMPLEMENT_CLASS (ALoreShot)
IMPLEMENT_CLASS(ALoreShot, false, false, false)
int ALoreShot::DoSpecialDamage (AActor *victim, int damage, FName damagetype)
{

2
src/g_strife/a_programmer.cpp
View file

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

2
src/g_strife/a_rebels.cpp
View file

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

2
src/g_strife/a_spectral.cpp
View file

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

28
src/g_strife/a_strifeitems.cpp
View file

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

6
src/g_strife/a_strifestuff.cpp
View file

@ -72,7 +72,7 @@ public:
int TakeSpecialDamage (AActor *inflictor, AActor *source, int damage, FName damagetype);
};
IMPLEMENT_CLASS (AForceFieldGuard)
IMPLEMENT_CLASS(AForceFieldGuard, false, false, false)
int AForceFieldGuard::TakeSpecialDamage (AActor *inflictor, AActor *source, int damage, FName damagetype)
{
@ -197,7 +197,7 @@ public:
void Die (AActor *source, AActor *inflictor, int dmgflags);
};
IMPLEMENT_CLASS (APowerCoupling)
IMPLEMENT_CLASS(APowerCoupling, false, false, false)
void APowerCoupling::Die (AActor *source, AActor *inflictor, int dmgflags)
{
@ -239,7 +239,7 @@ public:
}
};
IMPLEMENT_CLASS (AMeat)
IMPLEMENT_CLASS(AMeat, false, false, false)
//==========================================================================
//

6
src/g_strife/a_strifeweapons.cpp
View file

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

2
src/g_strife/strife_sbar.cpp
View file

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

2
src/info.cpp
View file

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

13
src/intermission/intermission.cpp
View file

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

2
src/m_argv.cpp
View file

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

2
src/m_cheat.cpp
View file

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

2
src/menu/colorpickermenu.cpp
View file

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

2
src/menu/joystickmenu.cpp
View file

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

2
src/menu/listmenu.cpp
View file

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

6
src/menu/loadsavemenu.cpp
View file

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

2
src/menu/menu.cpp
View file

@ -91,7 +91,7 @@ static bool MenuEnabled = true;
//
//============================================================================
IMPLEMENT_POINTY_CLASS(DMenu)
IMPLEMENT_CLASS(DMenu, false, true, false)
IMPLEMENT_POINTERS_START(DMenu)
IMPLEMENT_POINTER(mParentMenu)

2
src/menu/menuinput.cpp
View file

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

10
src/menu/messagebox.cpp
View file

@ -73,7 +73,7 @@ public:
virtual void HandleResult(bool res);
};
IMPLEMENT_CLASS(DMessageBoxMenu)
IMPLEMENT_CLASS(DMessageBoxMenu, false, false, false)
//=============================================================================
//
@ -365,7 +365,7 @@ public:
virtual void HandleResult(bool res);
};
IMPLEMENT_CLASS(DQuitMenu)
IMPLEMENT_CLASS(DQuitMenu, false, false, false)
//=============================================================================
//
@ -458,7 +458,7 @@ public:
virtual void HandleResult(bool res);
};
IMPLEMENT_CLASS(DEndGameMenu)
IMPLEMENT_CLASS(DEndGameMenu, false, false, false)
//=============================================================================
//
@ -536,7 +536,7 @@ public:
virtual void HandleResult(bool res);
};
IMPLEMENT_CLASS(DQuickSaveMenu)
IMPLEMENT_CLASS(DQuickSaveMenu, false, false, false)
//=============================================================================
//
@ -632,7 +632,7 @@ public:
virtual void HandleResult(bool res);
};
IMPLEMENT_CLASS(DQuickLoadMenu)
IMPLEMENT_CLASS(DQuickLoadMenu, false, false, false)
//=============================================================================
//

7
src/menu/optionmenu.cpp
View file

@ -64,8 +64,7 @@ void M_DrawConText (int color, int x, int y, const char *str)
TAG_DONE);
}
IMPLEMENT_CLASS(DOptionMenu)
IMPLEMENT_CLASS(DOptionMenu, false, false, false)
//=============================================================================
//
@ -579,7 +578,7 @@ public:
}
};
IMPLEMENT_CLASS(DGameplayMenu)
IMPLEMENT_CLASS(DGameplayMenu, false, false, false)
class DCompatibilityMenu : public DOptionMenu
{
@ -601,4 +600,4 @@ public:
}
};
IMPLEMENT_CLASS(DCompatibilityMenu)
IMPLEMENT_CLASS(DCompatibilityMenu, false, false, false)

2
src/menu/optionmenuitems.h
View file

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

2
src/menu/playermenu.cpp
View file

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

2
src/menu/readthis.cpp
View file

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

2
src/menu/videomenu.cpp
View file

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

6
src/p_acs.cpp
View file

@ -1369,7 +1369,7 @@ private:
DPlaneWatcher() {}
};
IMPLEMENT_POINTY_CLASS(DPlaneWatcher)
IMPLEMENT_CLASS(DPlaneWatcher, false, true, false)
IMPLEMENT_POINTERS_START(DPlaneWatcher)
IMPLEMENT_POINTER(Activator)
@ -2860,7 +2860,7 @@ void FBehavior::StaticStopMyScripts (AActor *actor)
//---- The ACS Interpreter ----//
IMPLEMENT_POINTY_CLASS(DACSThinker)
IMPLEMENT_CLASS(DACSThinker, false, true, false)
IMPLEMENT_POINTERS_START(DACSThinker)
IMPLEMENT_POINTER(LastScript)
@ -2991,7 +2991,7 @@ void DACSThinker::StopScriptsFor (AActor *actor)
}
}
IMPLEMENT_POINTY_CLASS(DLevelScript)
IMPLEMENT_CLASS(DLevelScript, false, true, false)
IMPLEMENT_POINTERS_START(DLevelScript)
IMPLEMENT_POINTER(next)

2
src/p_buildmap.cpp
View file

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

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