diff options
| author | megamage <none@none> | 2009-02-02 17:39:42 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-02 17:39:42 -0600 |
| commit | 6b51a431768444f6e52fc314a5fe0969262550a5 (patch) | |
| tree | 51cab682c8b61bb5a29cd0e0f0a89b78c37dd1f1 /src/game/SpellMgr.cpp | |
| parent | 4e13ff356ffa9a9ec2ca58ebdc3cfe7cea0dcca8 (diff) | |
| parent | 8dfe8cd64a29dfb57e392733929e86abaa749e6b (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellMgr.cpp')
| -rw-r--r-- | src/game/SpellMgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 0b7053db677..433ebe80cc9 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -2232,7 +2232,7 @@ void SpellMgr::LoadSpellCustomAttr() mSpellCustomAttr[i] |= SPELL_ATTR_CU_DIRECT_DAMAGE; break; case SPELL_EFFECT_CHARGE: - if(!spellInfo->speed) + if(!spellInfo->speed && !spellInfo->SpellFamilyName) spellInfo->speed = SPEED_CHARGE; mSpellCustomAttr[i] |= SPELL_ATTR_CU_CHARGE; case SPELL_EFFECT_TRIGGER_SPELL: |