diff options
| author | ccrs <ccrs@users.noreply.github.com> | 2017-08-12 17:35:46 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2020-08-23 00:48:46 +0200 |
| commit | 0a133e77d61fc6bafad7b60b74604d5da648ece9 (patch) | |
| tree | 0a3d4252830a2da40b65e0f83cfe1067d85219c7 /src/server/game/Entities | |
| parent | 7586daad6289f022ea2e625d74c370cd46423e9c (diff) | |
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)
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 7 | ||||
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.h | 1 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.h | 4 |
3 files changed, 2 insertions, 10 deletions
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<Creature>, 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); } |