diff options
| author | megamage <none@none> | 2009-01-30 19:26:53 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-01-30 19:26:53 -0600 |
| commit | 2096e645fe7a58a1a92f293bceb91aaa23aa1e5d (patch) | |
| tree | 9543307673352f7407fc08586e1c20e9939597d7 /src/game/SpellMgr.cpp | |
| parent | 1707d1e5aec42d521eb986520a93a008e1c1fce0 (diff) | |
*Update to Mangos 7205.
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellMgr.cpp')
| -rw-r--r-- | src/game/SpellMgr.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 3172a47ca38..39ed6f6b77d 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -346,8 +346,8 @@ SpellSpecific GetSpellSpecific(uint32 spellId) if (spellInfo->Dispel == DISPEL_CURSE) return SPELL_CURSE; - // family flag 37 (only part spells have family name) - if (spellInfo->SpellFamilyFlags & 0x2000000000LL) + // Warlock (Demon Armor | Demon Skin | Fel Armor) + if (spellInfo->SpellFamilyFlags & 0x2000002000000000LL || spellInfo->SpellFamilyFlags2 & 0x00000010) return SPELL_WARLOCK_ARMOR; //seed of corruption and corruption @@ -406,12 +406,6 @@ SpellSpecific GetSpellSpecific(uint32 spellId) break; } - // only warlock armor/skin have this (in additional to family cases) - if( spellInfo->SpellVisual[0] == 130 && spellInfo->SpellIconID == 89) - { - return SPELL_WARLOCK_ARMOR; - } - // elixirs can have different families, but potion most ofc. if(SpellSpecific sp = spellmgr.GetSpellElixirSpecific(spellInfo->Id)) return sp; |