josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core: Rename GetDispellMask to GetDispelMask

Browse Source
This commit is contained in:
Spp-
2011-07-06 13:21:39 +02:00
parent e5b5f4e2c7
commit e3729950b9
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Unit/Unit.cpp
+1 -1
View File
@@ -11964,7 +11964,7 @@ void Unit::ApplySpellDispelImmunity(const SpellEntry * spellProto, DispelType ty
if (apply && spellProto->AttributesEx & SPELL_ATTR1_DISPEL_AURAS_ON_IMMUNITY) if (apply && spellProto->AttributesEx & SPELL_ATTR1_DISPEL_AURAS_ON_IMMUNITY)
{ {
// Create dispel mask by dispel type // Create dispel mask by dispel type
uint32 dispelMask = GetDispellMask(type); uint32 dispelMask = GetDispelMask(type);
// Dispel all existing auras vs current dispel type // Dispel all existing auras vs current dispel type
AuraApplicationMap& auras = GetAppliedAuras(); AuraApplicationMap& auras = GetAppliedAuras();
for (AuraApplicationMap::iterator itr = auras.begin(); itr != auras.end();) for (AuraApplicationMap::iterator itr = auras.begin(); itr != auras.end();)
src/server/game/Spells/Spell.cpp
+1 -1
View File
@@ -5545,7 +5545,7 @@ SpellCastResult Spell::CheckCasterAuras() const
else if (m_spellInfo->EffectApplyAuraName[i] == SPELL_AURA_MECHANIC_IMMUNITY) else if (m_spellInfo->EffectApplyAuraName[i] == SPELL_AURA_MECHANIC_IMMUNITY)
mechanic_immune |= 1 << uint32(m_spellInfo->EffectMiscValue[i]); mechanic_immune |= 1 << uint32(m_spellInfo->EffectMiscValue[i]);
else if (m_spellInfo->EffectApplyAuraName[i] == SPELL_AURA_DISPEL_IMMUNITY) 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 // immune movement impairment and loss of control
if (m_spellInfo->Id == 42292 || m_spellInfo->Id == 59752) if (m_spellInfo->Id == 42292 || m_spellInfo->Id == 59752)
src/server/game/Spells/SpellEffects.cpp
+3 -3
View File
@@ -1752,7 +1752,7 @@ void Spell::EffectTriggerSpell(SpellEffIndex effIndex)
// Cloak of Shadows // Cloak of Shadows
case 35729: case 35729:
{ {
uint32 dispelMask = GetDispellMask(DISPEL_ALL); uint32 dispelMask = GetDispelMask(DISPEL_ALL);
Unit::AuraApplicationMap& Auras = unitTarget->GetAppliedAuras(); Unit::AuraApplicationMap& Auras = unitTarget->GetAppliedAuras();
for (Unit::AuraApplicationMap::iterator iter = Auras.begin(); iter != Auras.end();) 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 // Create dispel mask by dispel type
uint32 dispel_type = m_spellInfo->EffectMiscValue[effIndex]; 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 // we should not be able to dispel diseases if the target is affected by unholy blight
if (dispelMask & (1 << DISPEL_DISEASE) && unitTarget->HasAura(50536)) if (dispelMask & (1 << DISPEL_DISEASE) && unitTarget->HasAura(50536))
@@ -6514,7 +6514,7 @@ void Spell::EffectStealBeneficialBuff(SpellEffIndex effIndex)
DispelChargesList steal_list; DispelChargesList steal_list;
// Create dispel mask by dispel type // 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(); Unit::AuraMap const& auras = unitTarget->GetOwnedAuras();
for (Unit::AuraMap::const_iterator itr = auras.begin(); itr != auras.end(); ++itr) for (Unit::AuraMap::const_iterator itr = auras.begin(); itr != auras.end(); ++itr)
{ {
src/server/game/Spells/SpellMgr.h
+1 -1
View File
@@ -539,7 +539,7 @@ inline Mechanics GetEffectMechanic(SpellEntry const* spellInfo, int32 effect)
return MECHANIC_NONE; return MECHANIC_NONE;
} }
inline uint32 GetDispellMask(DispelType dispel) inline uint32 GetDispelMask(DispelType dispel)
{ {
// If dispel all // If dispel all
if (dispel == DISPEL_ALL) if (dispel == DISPEL_ALL)