diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index d124b7850..67a7bd844 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -375,7 +375,7 @@ Aura::Aura(SpellEntry const* spellproto, SpellEffectIndex eff, int32 *currentBas m_spellmod(NULL), m_timeCla(1000), m_periodicTimer(0), m_periodicTick(0), m_removeMode(AURA_REMOVE_BY_DEFAULT), m_effIndex(eff), m_spellAuraHolder(holder), m_isPersistent(false), -m_positive(false), m_isPeriodic(false), m_isAreaAura(false), m_in_use(0), m_deleted(false) +m_positive(false), m_isPeriodic(false), m_isAreaAura(false), m_in_use(0) { ASSERT(target); diff --git a/src/game/SpellAuras.h b/src/game/SpellAuras.h index 376c88a08..c0a859d21 100644 --- a/src/game/SpellAuras.h +++ b/src/game/SpellAuras.h @@ -62,13 +62,7 @@ class MANGOS_DLL_SPEC SpellAuraHolder void SetStackAmount(uint8 stackAmount); bool ModStackAmount(int32 num); // return true if last charge dropped - Aura* GetAuraByEffectIndex(SpellEffectIndex index) const - { - if (Aura *aur = m_auras[index]) - return aur; - else - return NULL; - } + Aura* GetAuraByEffectIndex(SpellEffectIndex index) const { return m_auras[index]; } uint32 GetId() const { return m_spellProto->Id; } SpellEntry const* GetSpellProto() const { return m_spellProto; } @@ -407,7 +401,6 @@ class MANGOS_DLL_SPEC Aura bool IsAreaAura() const { return m_isAreaAura; } bool IsPeriodic() const { return m_isPeriodic; } bool IsInUse() const { return m_in_use; } - bool IsDeleted() const { return m_deleted; } void SetInUse(bool state) { @@ -476,7 +469,6 @@ class MANGOS_DLL_SPEC Aura bool m_positive:1; bool m_isPeriodic:1; bool m_isAreaAura:1; - bool m_deleted:1; // true if RemoveAura(iterator) called while in Aura::ApplyModifier call (added to Unit::m_deletedAuras) bool m_isPersistent:1; uint32 m_in_use; // > 0 while in Aura::ApplyModifier call/Aura::Update/etc diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 4419927f8..059059505 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10312" + #define REVISION_NR "10313" #endif // __REVISION_NR_H__