diff options
| author | n0n4m3 <none@none> | 2009-12-26 11:57:57 +0100 |
|---|---|---|
| committer | n0n4m3 <none@none> | 2009-12-26 11:57:57 +0100 |
| commit | 4638c8be9fea84998a9c77f96ae62b0f6eeeb68b (patch) | |
| tree | faf7614bb9a4476abbec32b2805311c2e0c86e1b /src | |
| parent | 2fa14abf42ab4a094405b5407b39faaf018d9072 (diff) | |
Partly revert 6760
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Unit.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 24cd4a71b16..3984614b05e 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -11001,9 +11001,9 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy) if (GetTypeId() != TYPEID_PLAYER) { // Set home position at place of engaging combat for escorted creatures - if ((IsAIEnabled && ((Creature*)this)->AI()->IsEscorted()) && - (GetMotionMaster()->GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE || - GetMotionMaster()->GetCurrentMovementGeneratorType() == POINT_MOTION_TYPE)) + if (( IsAIEnabled && ((Creature*)this)->AI()->IsEscorted() ) || + GetMotionMaster()->GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE || + GetMotionMaster()->GetCurrentMovementGeneratorType() == POINT_MOTION_TYPE) ((Creature*)this)->SetHomePosition(GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation()); if (enemy) |