flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

EntityEffect: Inlined functions, added explicit copy constructor and operator.

Browse Source
This commit is contained in:
archshift 2014-07-13 15:43:49 -07:00
parent f77723128c
commit 0409daf736
2 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/Entities/EntityEffect.cpp
View File

@ -33,7 +33,11 @@ cEntityEffect::cEntityEffect(int a_Duration, short a_Intensity, double a_Distanc
cEntityEffect::~cEntityEffect() cEntityEffect::cEntityEffect(const cEntityEffect & a_OtherEffect):
m_Ticks(a_OtherEffect.m_Ticks),
m_Duration(a_OtherEffect.m_Duration),
m_Intensity(a_OtherEffect.m_Intensity),
m_DistanceModifier(a_OtherEffect.m_DistanceModifier)
{ {
} }
@ -42,6 +46,19 @@ cEntityEffect::~cEntityEffect()
cEntityEffect & cEntityEffect::operator=(cEntityEffect a_OtherEffect)
{
std::swap(m_Ticks, a_OtherEffect.m_Ticks);
std::swap(m_Duration, a_OtherEffect.m_Duration);
std::swap(m_Intensity, a_OtherEffect.m_Intensity);
std::swap(m_DistanceModifier, a_OtherEffect.m_DistanceModifier);
return *this;
}
cEntityEffect * cEntityEffect::CreateEntityEffect(cEntityEffect::eType a_EffectType, int a_Duration, short a_Intensity, double a_DistanceModifier) cEntityEffect * cEntityEffect::CreateEntityEffect(cEntityEffect::eType a_EffectType, int a_Duration, short a_Intensity, double a_DistanceModifier)
{ {
switch (a_EffectType) switch (a_EffectType)
@ -90,22 +107,6 @@ void cEntityEffect::OnTick(cPawn & a_Target)
void cEntityEffect::OnActivate(cPawn & a_Target)
{
}
void cEntityEffect::OnDeactivate(cPawn & a_Target)
{
}
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// Instant Health // Instant Health
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////

14
src/Entities/EntityEffect.h
View File

@ -45,7 +45,15 @@ public:
@param a_DistanceModifier The distance modifier for affecting potency, defaults to 1 */ @param a_DistanceModifier The distance modifier for affecting potency, defaults to 1 */
cEntityEffect(int a_Duration, short a_Intensity, double a_DistanceModifier = 1); cEntityEffect(int a_Duration, short a_Intensity, double a_DistanceModifier = 1);
virtual ~cEntityEffect(void); /** Creates an entity effect by copying another
@param a_OtherEffect The other effect to copy */
cEntityEffect(const cEntityEffect & a_OtherEffect);
/** Creates an entity effect by copying another
@param a_OtherEffect The other effect to copy */
cEntityEffect & operator=(cEntityEffect a_OtherEffect);
virtual ~cEntityEffect(void) {};
/** Creates a pointer to the proper entity effect from the effect type /** Creates a pointer to the proper entity effect from the effect type
@warning This function creates raw pointers that must be manually managed. @warning This function creates raw pointers that must be manually managed.
@ -70,8 +78,8 @@ public:
void SetDistanceModifier(double a_DistanceModifier) { m_DistanceModifier = a_DistanceModifier; } void SetDistanceModifier(double a_DistanceModifier) { m_DistanceModifier = a_DistanceModifier; }
virtual void OnTick(cPawn & a_Target); virtual void OnTick(cPawn & a_Target);
virtual void OnActivate(cPawn & a_Target); virtual void OnActivate(cPawn & a_Target) { }
virtual void OnDeactivate(cPawn & a_Target); virtual void OnDeactivate(cPawn & a_Target) { }
protected: protected:
/** How many ticks this effect has been active for */ /** How many ticks this effect has been active for */