diff options
| author | XTZGZoReX <none@none> | 2009-04-07 12:24:41 +0200 |
|---|---|---|
| committer | XTZGZoReX <none@none> | 2009-04-07 12:24:41 +0200 |
| commit | 65200e103984ba76b6c3fc13ad1c2776f19a7ab7 (patch) | |
| tree | 4c23770b8504ef1a4cf3c1a0d8bbb59a96877fff /src/game/SpellEffects.cpp | |
| parent | af2d4f039bd3dc87e8112adf1d8af0744e6ac11d (diff) | |
| parent | 2fe9fed7c71697af06b981e221ea54acb62abb6b (diff) | |
* Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellEffects.cpp')
| -rw-r--r-- | src/game/SpellEffects.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index cb4214dc11f..5dac4ca1a7e 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -1340,13 +1340,13 @@ void Spell::EffectDummy(uint32 i) m_caster->CastCustomSpell(m_caster,34846,&chargeBasePoints0,NULL,NULL,true); return; } - //Slam - if(m_spellInfo->SpellFamilyFlags[0] & 0x200000 && m_spellInfo->SpellIconID == 559) - { - int32 bp0 = damage; - m_caster->CastCustomSpell(unitTarget, 50783, &bp0, NULL, NULL, true, 0); + //Slam + if(m_spellInfo->SpellFamilyFlags[0] & 0x200000 && m_spellInfo->SpellIconID == 559) + { + int32 bp0 = damage; + m_caster->CastCustomSpell(unitTarget, 50783, &bp0, NULL, NULL, true, 0); return; - } + } // Execute if(m_spellInfo->SpellFamilyFlags[0] & 0x20000000) { |