diff options
| author | Machiavelli <none@none> | 2009-06-10 08:45:45 +0200 |
|---|---|---|
| committer | Machiavelli <none@none> | 2009-06-10 08:45:45 +0200 |
| commit | ee9beadbc20d24ec11346858db36c029c9c04b90 (patch) | |
| tree | ad8d5f89f9b7e1418c5bc00990370224b91453f3 /src/game/FleeingMovementGenerator.cpp | |
| parent | f137dc02ecadb515928655dd6603f33187731fec (diff) | |
| parent | c9d9ae1e491243f82be5ac84dc2ad51dfbae35eb (diff) | |
Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/FleeingMovementGenerator.cpp')
| -rw-r--r-- | src/game/FleeingMovementGenerator.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game/FleeingMovementGenerator.cpp b/src/game/FleeingMovementGenerator.cpp index 31fc350af70..27c4490801d 100644 --- a/src/game/FleeingMovementGenerator.cpp +++ b/src/game/FleeingMovementGenerator.cpp @@ -45,7 +45,7 @@ FleeingMovementGenerator<T>::_setTargetLocation(T &owner) if(!_getPoint(owner, x, y, z)) return; - owner.addUnitState(UNIT_STAT_FLEEING); + owner.addUnitState(UNIT_STAT_FLEEING | UNIT_STAT_ROAMING); Traveller<T> traveller(owner); i_destinationHolder.SetDestination(traveller, x, y, z); } @@ -304,7 +304,7 @@ FleeingMovementGenerator<T>::Initialize(T &owner) _Init(owner); owner.CastStop(); - owner.addUnitState(UNIT_STAT_FLEEING); + owner.addUnitState(UNIT_STAT_FLEEING | UNIT_STAT_ROAMING); owner.SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_FLEEING); owner.SetUInt64Value(UNIT_FIELD_TARGET, 0); owner.RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); @@ -353,7 +353,7 @@ void FleeingMovementGenerator<T>::Finalize(T &owner) { owner.RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_FLEEING); - owner.clearUnitState(UNIT_STAT_FLEEING); + owner.clearUnitState(UNIT_STAT_FLEEING | UNIT_STAT_ROAMING); if(owner.GetTypeId() == TYPEID_UNIT && owner.getVictim()) owner.SetUInt64Value(UNIT_FIELD_TARGET, owner.getVictim()->GetGUID()); } @@ -413,7 +413,7 @@ template bool FleeingMovementGenerator<Creature>::Update(Creature &, const uint3 void TimedFleeingMovementGenerator::Finalize(Unit &owner) { - owner.clearUnitState(UNIT_STAT_FLEEING); + owner.clearUnitState(UNIT_STAT_FLEEING | UNIT_STAT_ROAMING); if (Unit* victim = owner.getVictim()) { if (owner.isAlive()) |