From 717f1aefc99e2bc73537dace2f2c6046aebf42a9 Mon Sep 17 00:00:00 2001 From: Kudlaty Date: Sat, 31 Oct 2009 03:33:04 +0100 Subject: *Change virtual bool IsEscorted in escort_ai.h to check if creature is escorted or not *If creature use POINT_MOTION_TYPE, sethomeposition in combat start point --HG-- branch : trunk --- src/game/Unit.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/game/Unit.cpp') diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 459d9c40bac..3c0e8a94c20 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -10616,7 +10616,8 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy) { // Set home position at place of engaging combat for escorted creatures if(( IsAIEnabled && ((Creature*)this)->AI()->IsEscorted() ) || - GetMotionMaster()->GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE) + GetMotionMaster()->GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE || + ((Creature*)this)->GetMotionMaster()->GetCurrentMovementGeneratorType() == POINT_MOTION_TYPE) ((Creature*)this)->SetHomePosition(GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation()); if (enemy) -- cgit v1.2.3