[c12682] Keep CombatMovement, Running and Waypoint-Paused states afte…

…r evade (based on commit [12490] - 40d014a)
cmangos · Aug 19, 2013 · 6cad863 · 6cad863
1 parent 22f520e
commit 6cad863
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/game/HomeMovementGenerator.cpp b/src/game/HomeMovementGenerator.cpp
@@ -52,7 +52,7 @@ void HomeMovementGenerator<Creature>::_setTargetLocation(Creature& owner)
     init.Launch();
 
     arrived = false;
-    owner.clearUnitState(UNIT_STAT_ALL_STATE);
+    owner.clearUnitState(UNIT_STAT_ALL_DYN_STATES);
 }
 
 bool HomeMovementGenerator<Creature>::Update(Creature& owner, const uint32& time_diff)

diff --git a/src/game/Unit.h b/src/game/Unit.h
@@ -467,7 +467,8 @@ enum UnitState
 
     UNIT_STAT_RUNNING_STATE   = UNIT_STAT_CHASE_MOVE | UNIT_STAT_FLEEING_MOVE | UNIT_STAT_RUNNING,
 
-    UNIT_STAT_ALL_STATE       = 0xFFFFFFFF
+    UNIT_STAT_ALL_STATE       = 0xFFFFFFFF,
+    UNIT_STAT_ALL_DYN_STATES  = UNIT_STAT_ALL_STATE & ~(UNIT_STAT_NO_COMBAT_MOVEMENT | UNIT_STAT_RUNNING | UNIT_STAT_WAYPOINT_PAUSED | UNIT_STAT_IGNORE_PATHFINDING),
 };
 
 enum UnitMoveType

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 "12681"
+ #define REVISION_NR "12682"
 #endif // __REVISION_NR_H__