aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormegamage <none@none>2009-03-22 18:45:44 -0600
committermegamage <none@none>2009-03-22 18:45:44 -0600
commitb5eed3626ddc9dbc14dece208782c9a698bab7ae (patch)
treedfbeef0a8b6a4a9923ef06d587b27b27bdd22e40 /src
parentb5abc43ad54434dda4494fd386834be6a83d629f (diff)
*Fix a bug that combo points are never taken.
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/Spell.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 2808b6fdbaf..0e0f127a127 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -1025,9 +1025,8 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target)
if(!m_IsTriggeredSpell && !m_CastItem
&& NeedsComboPoints(m_spellInfo)
&& m_caster->GetTypeId()==TYPEID_PLAYER
- && target->targetGUID==m_targets.getUnitTargetGUID()
- && missInfo!= SPELL_MISS_NONE
- && missInfo != SPELL_MISS_MISS)
+ && target->targetGUID == m_targets.getUnitTargetGUID()
+ && (missInfo == SPELL_MISS_NONE || missInfo == SPELL_MISS_MISS))
((Player*)m_caster)->ClearComboPoints();
// Call scripted function for AI if this spell is casted upon a creature (except pets)