mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 01:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10313] Drop now unused Aura::m_deleted.

Browse source 
Most functionality move to similar flag of AuraHolder.
This commit is contained in:
VladimirMangos 2010-08-03 14:41:08 +04:00
parent 131fb72006
commit 835efe7f6a
3 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/SpellAuras.cpp
View file

@ -375,7 +375,7 @@ Aura::Aura(SpellEntry const* spellproto, SpellEffectIndex eff, int32 *currentBas
m_spellmod(NULL), m_spellmod(NULL),
m_timeCla(1000), m_periodicTimer(0), m_periodicTick(0), m_removeMode(AURA_REMOVE_BY_DEFAULT), 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_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); ASSERT(target);

10
src/game/SpellAuras.h
View file

@ -62,13 +62,7 @@ class MANGOS_DLL_SPEC SpellAuraHolder
void SetStackAmount(uint8 stackAmount); void SetStackAmount(uint8 stackAmount);
bool ModStackAmount(int32 num); // return true if last charge dropped bool ModStackAmount(int32 num); // return true if last charge dropped
Aura* GetAuraByEffectIndex(SpellEffectIndex index) const Aura* GetAuraByEffectIndex(SpellEffectIndex index) const { return m_auras[index]; }
{
if (Aura *aur = m_auras[index])
return aur;
else
return NULL;
}
uint32 GetId() const { return m_spellProto->Id; } uint32 GetId() const { return m_spellProto->Id; }
SpellEntry const* GetSpellProto() const { return m_spellProto; } SpellEntry const* GetSpellProto() const { return m_spellProto; }
@ -407,7 +401,6 @@ class MANGOS_DLL_SPEC Aura
bool IsAreaAura() const { return m_isAreaAura; } bool IsAreaAura() const { return m_isAreaAura; }
bool IsPeriodic() const { return m_isPeriodic; } bool IsPeriodic() const { return m_isPeriodic; }
bool IsInUse() const { return m_in_use; } bool IsInUse() const { return m_in_use; }
bool IsDeleted() const { return m_deleted; }
void SetInUse(bool state) void SetInUse(bool state)
{ {
@ -476,7 +469,6 @@ class MANGOS_DLL_SPEC Aura
bool m_positive:1; bool m_positive:1;
bool m_isPeriodic:1; bool m_isPeriodic:1;
bool m_isAreaAura: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; bool m_isPersistent:1;
uint32 m_in_use; // > 0 while in Aura::ApplyModifier call/Aura::Update/etc uint32 m_in_use; // > 0 while in Aura::ApplyModifier call/Aura::Update/etc

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10312" #define REVISION_NR "10313"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__