From 0a133e77d61fc6bafad7b60b74604d5da648ece9 Mon Sep 17 00:00:00 2001 From: ccrs Date: Sat, 12 Aug 2017 17:35:46 +0200 Subject: Core/Movement: 7fff83d6752 followup remove home position set from creature PauseMovement, and use it when necessary change log level on DelayedDelete (cherry picked from commit cd4775420a4894012616d54467eb3827430245b5) --- src/server/game/Entities/Creature/Creature.cpp | 7 ------- src/server/game/Entities/Creature/Creature.h | 1 - src/server/game/Entities/Unit/Unit.h | 4 ++-- 3 files changed, 2 insertions(+), 10 deletions(-) (limited to 'src/server/game/Entities') diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index ca87ccb3196..6eab8bef3ec 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -356,13 +356,6 @@ void Creature::DisappearAndDie() ForcedDespawn(0); } -void Creature::PauseMovement(uint32 timer/* = 0*/, uint8 slot/* = 0*/) -{ - Unit::PauseMovement(timer, slot); - - SetHomePosition(GetPosition()); -} - bool Creature::IsReturningHome() const { if (GetMotionMaster()->GetMotionSlotType(MOTION_SLOT_ACTIVE) == HOME_MOTION_TYPE) diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index 2b937e54389..1efa1efa566 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -296,7 +296,6 @@ class TC_GAME_API Creature : public Unit, public GridObject, public Ma uint32 GetCurrentWaypointID() const { return m_waypointID; } void UpdateWaypointID(uint32 wpID) { m_waypointID = wpID; } - void PauseMovement(uint32 timer = 0, uint8 slot = 0) override; // timer in ms bool IsReturningHome() const; void SearchFormation(); diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index fb2af4bb11c..82297d25d92 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1909,8 +1909,8 @@ class TC_GAME_API Unit : public WorldObject bool IsStopped() const { return !(HasUnitState(UNIT_STATE_MOVING)); } void StopMoving(); - virtual void PauseMovement(uint32 timer = 0, uint8 slot = 0); // timer in ms - void ResumeMovement(uint32 timer = 0, uint8 slot = 0); + void PauseMovement(uint32 timer = 0, uint8 slot = 0); // timer in ms + void ResumeMovement(uint32 timer = 0, uint8 slot = 0); // timer in ms void AddUnitMovementFlag(uint32 f) { m_movementInfo.AddMovementFlag(f); } void RemoveUnitMovementFlag(uint32 f) { m_movementInfo.RemoveMovementFlag(f); } -- cgit v1.2.3