*Update to Mangos 7205.

--HG--
branch : trunk
This commit is contained in:
megamage
2009-01-30 19:26:53 -06:00
parent 1707d1e5ae
commit 2096e645fe
6 changed files with 15 additions and 49 deletions

View File

@@ -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;