diff options
| author | Spp <spp@jorge.gr> | 2012-07-30 10:07:26 +0200 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-07-30 10:07:26 +0200 |
| commit | 5a99dfad149245c685c088e9e08aa445428b9e53 (patch) | |
| tree | 9a1c27b6c9ec950da21df00251df09e8142bdb76 /src/server/game/Spells/Spell.cpp | |
| parent | b460c496e2e2801bc2ff8ac8326765da094fbec3 (diff) | |
Warning fixes + compile fix after the merge
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rwxr-xr-x | src/server/game/Spells/Spell.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 590f880a931..eef11ab25a9 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -2576,6 +2576,7 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit* unit, uint32 effectMask, bool scaleA for (uint32 effectNumber = 0; effectNumber < MAX_SPELL_EFFECTS; ++effectNumber) { if (effectMask & (1 << effectNumber)) + { if (unit->IsImmunedToSpellEffect(m_spellInfo, effectNumber)) effectMask &= ~(1 << effectNumber); else if (m_spellInfo->Effects[effectNumber].IsAura() && !m_spellInfo->IsPositiveEffect(effectNumber)) @@ -2590,7 +2591,9 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit* unit, uint32 effectMask, bool scaleA returnVal = SPELL_MISS_RESIST; } } + } } + if (!effectMask) return returnVal; |