*Do not allow Divine Spirit and Prayer of Divine spirit to stack.

--HG--
branch : trunk
This commit is contained in:
adrycasillo
2009-06-06 09:14:04 +02:00
parent 6f9f1a13f5
commit 8bc014b42d
2 changed files with 10 additions and 0 deletions
+9
View File
@@ -390,6 +390,14 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
break; break;
} }
case SPELLFAMILY_PRIEST:
{
// Divine Spirit and Prayer of Spirit
if (spellInfo->SpellFamilyFlags[0] & 0x20)
return SPELL_PRIEST_DIVINE_SPIRIT;
break;
}
case SPELLFAMILY_WARRIOR: case SPELLFAMILY_WARRIOR:
{ {
if (spellInfo->SpellFamilyFlags[1] & 0x000080 || spellInfo->SpellFamilyFlags[0] & 0x10000LL) if (spellInfo->SpellFamilyFlags[1] & 0x000080 || spellInfo->SpellFamilyFlags[0] & 0x10000LL)
@@ -520,6 +528,7 @@ bool IsSingleFromSpellSpecificPerTarget(uint32 spellSpec1,uint32 spellSpec2)
case SPELL_SCROLL: case SPELL_SCROLL:
case SPELL_WARRIOR_ENRAGE: case SPELL_WARRIOR_ENRAGE:
case SPELL_MAGE_ARCANE_BRILLANCE: case SPELL_MAGE_ARCANE_BRILLANCE:
case SPELL_PRIEST_DIVINE_SPIRIT:
return spellSpec1==spellSpec2; return spellSpec1==spellSpec2;
case SPELL_BATTLE_ELIXIR: case SPELL_BATTLE_ELIXIR:
return spellSpec2==SPELL_BATTLE_ELIXIR return spellSpec2==SPELL_BATTLE_ELIXIR
+1
View File
@@ -141,6 +141,7 @@ enum SpellSpecific
SPELL_SCROLL = 23, SPELL_SCROLL = 23,
SPELL_MAGE_ARCANE_BRILLANCE = 24, SPELL_MAGE_ARCANE_BRILLANCE = 24,
SPELL_WARRIOR_ENRAGE = 25, SPELL_WARRIOR_ENRAGE = 25,
SPELL_PRIEST_DIVINE_SPIRIT = 26,
}; };
#define SPELL_LINKED_MAX_SPELLS 200000 #define SPELL_LINKED_MAX_SPELLS 200000