diff options
| author | Machiavelli <none@none> | 2009-06-11 17:56:20 +0200 |
|---|---|---|
| committer | Machiavelli <none@none> | 2009-06-11 17:56:20 +0200 |
| commit | 1c97b2bf796fb367b77e653556220e69cf7b5878 (patch) | |
| tree | ffaa612c7502785edc750a664ebc2253c41e4f5c /src/game/SpellEffects.cpp | |
| parent | 6eaf6e962a31aa308406289d538aef30a56b95cb (diff) | |
| parent | 6c069aa5b8405d51202781104daf5c6e8642b891 (diff) | |
Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellEffects.cpp')
| -rw-r--r-- | src/game/SpellEffects.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 8d6d0bc7ae8..9b176683e7c 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -223,7 +223,10 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS]= &Spell::EffectEnchantItemPrismatic, //156 SPELL_EFFECT_ENCHANT_ITEM_PRISMATIC &Spell::EffectCreateItem2, //157 SPELL_EFFECT_CREATE_ITEM_2 create/learn item/spell for profession &Spell::EffectMilling, //158 SPELL_EFFECT_MILLING milling - &Spell::EffectRenamePet //159 SPELL_EFFECT_ALLOW_RENAME_PET allow rename pet once again + &Spell::EffectRenamePet, //159 SPELL_EFFECT_ALLOW_RENAME_PET allow rename pet once again + &Spell::EffectNULL, //160 SPELL_EFFECT_160 unused + &Spell::EffectNULL, //161 SPELL_EFFECT_161 second talent spec (learn/revert) + &Spell::EffectNULL //162 SPELL_EFFECT_162 activate primary/secondary spec }; void Spell::EffectNULL(uint32 /*i*/) @@ -4211,7 +4214,12 @@ void Spell::SpellDamageWeaponDmg(uint32 i) } if (!spellInfo) break; - m_caster->CastSpell(unitTarget, spellInfo, true); + int32 count = 1; + // Glyph of Devastate + if (AuraEffect * aurEff = m_caster->GetDummyAura(58388)) + count += aurEff->GetAmount(); + for (;count>0;count--) + m_caster->CastSpell(unitTarget, spellInfo, true); if (stack) spell_bonus += stack * CalculateDamage(2, unitTarget); } @@ -5546,6 +5554,7 @@ void Spell::EffectApplyGlyph(uint32 i) player->CastSpell(m_caster, gp->SpellId, true); player->SetGlyph(m_glyphIndex, glyph); + player->SendTalentsInfoData(false); } } } |