diff options
| author | megamage <none@none> | 2009-05-25 11:08:52 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-05-25 11:08:52 -0500 |
| commit | 7e1ca8f2ce85b0caa9fcd00d0c8352e18e17a1bf (patch) | |
| tree | 6abf707ad39baa6d76a0e505e2b97aeb22b482f1 /src/game/SpellMgr.cpp | |
| parent | 98049925a6805f8bdb9008bd006fcb1ed5eeffe3 (diff) | |
| parent | ee40287ef72ec00d3ede4abe5ad5aa68ac6cd7af (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellMgr.cpp')
| -rw-r--r-- | src/game/SpellMgr.cpp | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 0d39c6cf336..67e6380d5ea 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -354,22 +354,19 @@ SpellSpecific GetSpellSpecific(uint32 spellId) uint32 firstSpell = spellmgr.GetFirstSpellInChain(spellInfo->Id); switch (firstSpell) { - // Strength - case 8118: - // Stamina - case 8099: - // Spirit - case 8112: - //Intellect - case 8096: - // Agility - case 8115: - // Armor - case 8091: + case 8118: // Strength + case 8099: // Stamina + case 8112: // Spirit + case 8096: // Intellect + case 8115: // Agility + case 8091: // Armor return SPELL_SCROLL; + case 12880: // Enrage + case 12292: // Death Wish + return SPELL_WARRIOR_ENRAGE; } - break; } + break; } case SPELLFAMILY_MAGE: { @@ -514,6 +511,7 @@ bool IsSingleFromSpellSpecificPerTarget(uint32 spellSpec1,uint32 spellSpec2) case SPELL_FOOD: case SPELL_CHARM: case SPELL_SCROLL: + case SPELL_WARRIOR_ENRAGE: case SPELL_MAGE_ARCANE_BRILLANCE: return spellSpec1==spellSpec2; case SPELL_BATTLE_ELIXIR: |