[10638] More appropriate for warrior spell fail result for combo poin…

…t check fail.
mangos · Oct 24, 2010 · 342fd1b · 342fd1b
1 parent 9008c04
commit 342fd1b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
@@ -4311,7 +4311,8 @@ SpellCastResult Spell::CheckCast(bool strict)
 
         if (!m_IsTriggeredSpell && NeedsComboPoints(m_spellInfo) &&
             (!m_targets.getUnitTarget() || m_targets.getUnitTarget()->GetObjectGuid() != ((Player*)m_caster)->GetComboTargetGuid()))
-            return SPELL_FAILED_NO_COMBO_POINTS;
+            // warrior not have real combo-points at client side but use this way for mark allow Overpower use
+            return m_caster->getClass() == CLASS_WARRIOR ? SPELL_FAILED_CASTER_AURASTATE : SPELL_FAILED_NO_COMBO_POINTS;
     }
 
     if(Unit *target = m_targets.getUnitTarget())

diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "10637"
+ #define REVISION_NR "10638"
 #endif // __REVISION_NR_H__