diff options
author | Anubisss <none@none> | 2010-01-20 21:16:28 +0100 |
---|---|---|
committer | Anubisss <none@none> | 2010-01-20 21:16:28 +0100 |
commit | 81548313359384b50474bb6ad97d22f63ba71c20 (patch) | |
tree | d5e6608a939098d3fa0206f507c5c49601a20d37 /src/game/Creature.cpp | |
parent | 6855787a8376242120ef626f4fbbb80fc7b0baab (diff) | |
parent | fbe09a92f960e24b90711b55f0d2f3a864605d3d (diff) |
Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Creature.cpp')
-rw-r--r-- | src/game/Creature.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index d1149a44c03..29ed9983cd2 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -1620,12 +1620,12 @@ bool Creature::IsImmunedToSpell(SpellEntry const* spellInfo) return Unit::IsImmunedToSpell(spellInfo); } -bool Creature::IsImmunedToSpellEffect(SpellEntry const* spellInfo, uint32 index, bool checkMechanic) const +bool Creature::IsImmunedToSpellEffect(SpellEntry const* spellInfo, uint32 index) const { if (GetCreatureInfo()->MechanicImmuneMask & (1 << (spellInfo->EffectMechanic[index] - 1))) return true; - return Unit::IsImmunedToSpellEffect(spellInfo, index, checkMechanic); + return Unit::IsImmunedToSpellEffect(spellInfo, index); } SpellEntry const *Creature::reachWithSpellAttack(Unit *pVictim) |