- use default constructors for the thinkers to avoid empty non-inlined functions.

This commit is contained in:
Christoph Oelckers 2019-01-24 20:33:25 +01:00
parent 4d55c28b60
commit 7418ebef56
4 changed files with 12 additions and 50 deletions

View file

@ -57,10 +57,6 @@ static FRandom pr_fireflicker ("FireFlicker");
IMPLEMENT_CLASS(DLighting, false, false) IMPLEMENT_CLASS(DLighting, false, false)
DLighting::DLighting ()
{
}
DLighting::DLighting (sector_t *sector) DLighting::DLighting (sector_t *sector)
: DSectorEffect (sector) : DSectorEffect (sector)
{ {
@ -75,10 +71,6 @@ DLighting::DLighting (sector_t *sector)
IMPLEMENT_CLASS(DFireFlicker, false, false) IMPLEMENT_CLASS(DFireFlicker, false, false)
DFireFlicker::DFireFlicker ()
{
}
void DFireFlicker::Serialize(FSerializer &arc) void DFireFlicker::Serialize(FSerializer &arc)
{ {
Super::Serialize (arc); Super::Serialize (arc);
@ -142,10 +134,6 @@ DFireFlicker::DFireFlicker (sector_t *sector, int upper, int lower)
IMPLEMENT_CLASS(DFlicker, false, false) IMPLEMENT_CLASS(DFlicker, false, false)
DFlicker::DFlicker ()
{
}
void DFlicker::Serialize(FSerializer &arc) void DFlicker::Serialize(FSerializer &arc)
{ {
Super::Serialize (arc); Super::Serialize (arc);
@ -218,10 +206,6 @@ void EV_StartLightFlickering (int tag, int upper, int lower)
IMPLEMENT_CLASS(DLightFlash, false, false) IMPLEMENT_CLASS(DLightFlash, false, false)
DLightFlash::DLightFlash ()
{
}
void DLightFlash::Serialize(FSerializer &arc) void DLightFlash::Serialize(FSerializer &arc)
{ {
Super::Serialize (arc); Super::Serialize (arc);
@ -293,10 +277,6 @@ DLightFlash::DLightFlash (sector_t *sector, int min, int max)
IMPLEMENT_CLASS(DStrobe, false, false) IMPLEMENT_CLASS(DStrobe, false, false)
DStrobe::DStrobe ()
{
}
void DStrobe::Serialize(FSerializer &arc) void DStrobe::Serialize(FSerializer &arc)
{ {
Super::Serialize (arc); Super::Serialize (arc);
@ -549,10 +529,6 @@ void EV_LightChange (int tag, int value)
IMPLEMENT_CLASS(DGlow, false, false) IMPLEMENT_CLASS(DGlow, false, false)
DGlow::DGlow ()
{
}
void DGlow::Serialize(FSerializer &arc) void DGlow::Serialize(FSerializer &arc)
{ {
Super::Serialize (arc); Super::Serialize (arc);
@ -619,10 +595,6 @@ DGlow::DGlow (sector_t *sector)
IMPLEMENT_CLASS(DGlow2, false, false) IMPLEMENT_CLASS(DGlow2, false, false)
DGlow2::DGlow2 ()
{
}
void DGlow2::Serialize(FSerializer &arc) void DGlow2::Serialize(FSerializer &arc)
{ {
Super::Serialize (arc); Super::Serialize (arc);
@ -752,10 +724,6 @@ void EV_StartLightFading (int tag, int value, int tics)
IMPLEMENT_CLASS(DPhased, false, false) IMPLEMENT_CLASS(DPhased, false, false)
DPhased::DPhased ()
{
}
void DPhased::Serialize(FSerializer &arc) void DPhased::Serialize(FSerializer &arc)
{ {
Super::Serialize (arc); Super::Serialize (arc);

View file

@ -47,10 +47,6 @@ IMPLEMENT_POINTERS_START(DPusher)
IMPLEMENT_POINTER(m_Source) IMPLEMENT_POINTER(m_Source)
IMPLEMENT_POINTERS_END IMPLEMENT_POINTERS_END
DPusher::DPusher ()
{
}
void DPusher::Serialize(FSerializer &arc) void DPusher::Serialize(FSerializer &arc)
{ {
Super::Serialize (arc); Super::Serialize (arc);

View file

@ -127,7 +127,7 @@ class DLighting : public DSectorEffect
public: public:
DLighting(sector_t *sector); DLighting(sector_t *sector);
protected: protected:
DLighting(); DLighting() = default;
}; };
void EV_StartLightFlickering (int tag, int upper, int lower); void EV_StartLightFlickering (int tag, int upper, int lower);

View file

@ -7,7 +7,7 @@ class DLightTransfer : public DThinker
{ {
DECLARE_CLASS (DLightTransfer, DThinker) DECLARE_CLASS (DLightTransfer, DThinker)
DLightTransfer() {} DLightTransfer() = default;
public: public:
DLightTransfer (sector_t *srcSec, int target, bool copyFloor); DLightTransfer (sector_t *srcSec, int target, bool copyFloor);
void Serialize(FSerializer &arc); void Serialize(FSerializer &arc);
@ -32,7 +32,7 @@ class DWallLightTransfer : public DThinker
}; };
DECLARE_CLASS (DWallLightTransfer, DThinker) DECLARE_CLASS (DWallLightTransfer, DThinker)
DWallLightTransfer() {} DWallLightTransfer() = default;
public: public:
DWallLightTransfer (sector_t *srcSec, int target, uint8_t flags); DWallLightTransfer (sector_t *srcSec, int target, uint8_t flags);
void Serialize(FSerializer &arc); void Serialize(FSerializer &arc);
@ -61,7 +61,7 @@ protected:
int m_MaxLight; int m_MaxLight;
int m_MinLight; int m_MinLight;
private: private:
DFireFlicker(); DFireFlicker() = default;
}; };
class DFlicker : public DLighting class DFlicker : public DLighting
@ -76,7 +76,7 @@ protected:
int m_MaxLight; int m_MaxLight;
int m_MinLight; int m_MinLight;
private: private:
DFlicker(); DFlicker() = default;
}; };
class DLightFlash : public DLighting class DLightFlash : public DLighting
@ -94,7 +94,7 @@ protected:
int m_MaxTime; int m_MaxTime;
int m_MinTime; int m_MinTime;
private: private:
DLightFlash(); DLightFlash() = default;
}; };
class DStrobe : public DLighting class DStrobe : public DLighting
@ -112,7 +112,7 @@ protected:
int m_DarkTime; int m_DarkTime;
int m_BrightTime; int m_BrightTime;
private: private:
DStrobe(); DStrobe() = default;
}; };
class DGlow : public DLighting class DGlow : public DLighting
@ -127,7 +127,7 @@ protected:
int m_MaxLight; int m_MaxLight;
int m_Direction; int m_Direction;
private: private:
DGlow(); DGlow() = default;
}; };
// [RH] Glow from Light_Glow and Light_Fade specials // [RH] Glow from Light_Glow and Light_Fade specials
@ -145,7 +145,7 @@ protected:
int m_Tics; int m_Tics;
bool m_OneShot; bool m_OneShot;
private: private:
DGlow2(); DGlow2() = default;
}; };
// [RH] Phased light thinker // [RH] Phased light thinker
@ -156,7 +156,7 @@ public:
DPhased(sector_t *sector); DPhased(sector_t *sector);
DPhased(sector_t *sector, int baselevel, int phase); DPhased(sector_t *sector, int baselevel, int phase);
// These are for internal use only but the Create template needs access to them. // These are for internal use only but the Create template needs access to them.
DPhased(); DPhased() = default;
DPhased(sector_t *sector, int baselevel); DPhased(sector_t *sector, int baselevel);
void Serialize(FSerializer &arc); void Serialize(FSerializer &arc);
@ -183,7 +183,7 @@ public:
p_current p_current
}; };
DPusher (); DPusher () = default;
DPusher (EPusher type, line_t *l, int magnitude, int angle, AActor *source, int affectee); DPusher (EPusher type, line_t *l, int magnitude, int angle, AActor *source, int affectee);
void Serialize(FSerializer &arc); void Serialize(FSerializer &arc);
int CheckForSectorMatch (EPusher type, int tag); int CheckForSectorMatch (EPusher type, int tag);
@ -246,8 +246,6 @@ protected:
TObjPtr<DInterpolation*> m_Interpolations[3]; TObjPtr<DInterpolation*> m_Interpolations[3];
private: private:
DScroller () DScroller () = default;
{
}
}; };