[7697] Interrupt casting at enter to evade mode. Author: VladimirMangos

--HG--
branch : trunk

1 files changed, 5 insertions, 5 deletions

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index eb8a6e919e7..887ef6993df 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -7845,9 +7845,9 @@ bool Unit::AttackStop()
     return true;
 }
 
-void Unit::CombatStop(bool cast)
+void Unit::CombatStop(bool includingCast)
 {
-    if(cast && IsNonMeleeSpellCasted(false))
+    if (includingCast && IsNonMeleeSpellCasted(false))
         InterruptNonMeleeSpells(false);
 
     AttackStop();
@@ -7857,12 +7857,12 @@ void Unit::CombatStop(bool cast)
     ClearInCombat();
 }
 
-void Unit::CombatStopWithPets(bool cast)
+void Unit::CombatStopWithPets(bool includingCast)
 {
-    CombatStop(cast);
+    CombatStop(includingCast);
 
     for(ControlList::const_iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr)
-        (*itr)->CombatStop(cast);
+        (*itr)->CombatStop(includingCast);
 }
 
 bool Unit::isAttackingPlayer() const