diff options
author | Spp- <u84280@epreinf21.(none)> | 2011-07-06 13:21:39 +0200 |
---|---|---|
committer | Spp- <u84280@epreinf21.(none)> | 2011-07-06 13:21:39 +0200 |
commit | e3729950b9300b7050c0728e3b35e4472e5c9032 (patch) | |
tree | c080eb782d9dcf4a8d407ad18bde2b8753d958fe /src | |
parent | e5b5f4e2c735de033698c2b11e904a86d30a229d (diff) |
Core: Rename GetDispellMask to GetDispelMask
Diffstat (limited to 'src')
-rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 2 | ||||
-rwxr-xr-x | src/server/game/Spells/Spell.cpp | 2 | ||||
-rwxr-xr-x | src/server/game/Spells/SpellEffects.cpp | 6 | ||||
-rwxr-xr-x | src/server/game/Spells/SpellMgr.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 433dfc7be65..a6413835edc 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -11964,7 +11964,7 @@ void Unit::ApplySpellDispelImmunity(const SpellEntry * spellProto, DispelType ty if (apply && spellProto->AttributesEx & SPELL_ATTR1_DISPEL_AURAS_ON_IMMUNITY) { // Create dispel mask by dispel type - uint32 dispelMask = GetDispellMask(type); + uint32 dispelMask = GetDispelMask(type); // Dispel all existing auras vs current dispel type AuraApplicationMap& auras = GetAppliedAuras(); for (AuraApplicationMap::iterator itr = auras.begin(); itr != auras.end();) diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 926420b63e4..1830ba07a87 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -5545,7 +5545,7 @@ SpellCastResult Spell::CheckCasterAuras() const else if (m_spellInfo->EffectApplyAuraName[i] == SPELL_AURA_MECHANIC_IMMUNITY) mechanic_immune |= 1 << uint32(m_spellInfo->EffectMiscValue[i]); else if (m_spellInfo->EffectApplyAuraName[i] == SPELL_AURA_DISPEL_IMMUNITY) - dispel_immune |= GetDispellMask(DispelType(m_spellInfo->EffectMiscValue[i])); + dispel_immune |= GetDispelMask(DispelType(m_spellInfo->EffectMiscValue[i])); } // immune movement impairment and loss of control if (m_spellInfo->Id == 42292 || m_spellInfo->Id == 59752) diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 957de72b75c..29862c4800c 100755 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -1752,7 +1752,7 @@ void Spell::EffectTriggerSpell(SpellEffIndex effIndex) // Cloak of Shadows case 35729: { - uint32 dispelMask = GetDispellMask(DISPEL_ALL); + uint32 dispelMask = GetDispelMask(DISPEL_ALL); Unit::AuraApplicationMap& Auras = unitTarget->GetAppliedAuras(); for (Unit::AuraApplicationMap::iterator iter = Auras.begin(); iter != Auras.end();) { @@ -3151,7 +3151,7 @@ void Spell::EffectDispel(SpellEffIndex effIndex) // Create dispel mask by dispel type uint32 dispel_type = m_spellInfo->EffectMiscValue[effIndex]; - uint32 dispelMask = GetDispellMask(DispelType(dispel_type)); + uint32 dispelMask = GetDispelMask(DispelType(dispel_type)); // we should not be able to dispel diseases if the target is affected by unholy blight if (dispelMask & (1 << DISPEL_DISEASE) && unitTarget->HasAura(50536)) @@ -6514,7 +6514,7 @@ void Spell::EffectStealBeneficialBuff(SpellEffIndex effIndex) DispelChargesList steal_list; // Create dispel mask by dispel type - uint32 dispelMask = GetDispellMask(DispelType(m_spellInfo->EffectMiscValue[effIndex])); + uint32 dispelMask = GetDispelMask(DispelType(m_spellInfo->EffectMiscValue[effIndex])); Unit::AuraMap const& auras = unitTarget->GetOwnedAuras(); for (Unit::AuraMap::const_iterator itr = auras.begin(); itr != auras.end(); ++itr) { diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h index 9f4653e1051..f3de0f34747 100755 --- a/src/server/game/Spells/SpellMgr.h +++ b/src/server/game/Spells/SpellMgr.h @@ -539,7 +539,7 @@ inline Mechanics GetEffectMechanic(SpellEntry const* spellInfo, int32 effect) return MECHANIC_NONE; } -inline uint32 GetDispellMask(DispelType dispel) +inline uint32 GetDispelMask(DispelType dispel) { // If dispel all if (dispel == DISPEL_ALL) |