diff options
| author | Eridium <6587064+Killyana@users.noreply.github.com> | 2020-04-04 15:08:42 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-12-31 19:28:14 +0100 |
| commit | 924116f0461f5e1e03a026129b81dfe23faa20e4 (patch) | |
| tree | a429fa49162bb5887761063ae9ce5419c1b562bc /src/server/game/Movement/MotionMaster.cpp | |
| parent | c6916516989171d496d88eeb3454509521fd75ef (diff) | |
Core/Movement: Formation Rewrite (#24379)
* Core/Movement: Formation Rewrite
* Add a missing include
* fixed another warning
* meh
Co-authored-by: Ovahlord <Ovahlord@users.noreply.github.com>
Co-authored-by: Ovah <dreadkiller@gmx.de>
(cherry picked from commit 0e2342c1698d9e2dc8a8c9d559f232cbb83707cb)
Diffstat (limited to 'src/server/game/Movement/MotionMaster.cpp')
| -rw-r--r-- | src/server/game/Movement/MotionMaster.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index 3b21d0b4dec..d77ce6e9a73 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -1068,12 +1068,12 @@ void MotionMaster::MoveRotate(uint32 id, uint32 time, RotateDirection direction) Add(new RotateMovementGenerator(id, time, direction)); } -void MotionMaster::MoveFormation(uint32 id, Position destination, uint32 moveType, bool forceRun /*= false*/, bool forceOrientation /*= false*/) +void MotionMaster::MoveFormation(Unit* leader, float range, float angle, uint32 point1, uint32 point2) { - if (_owner->GetTypeId() == TYPEID_UNIT) + if (_owner->GetTypeId() == TYPEID_UNIT && leader) { - TC_LOG_DEBUG("movement.motionmaster", "MotionMaster::MoveFormation: '%s', targeted point Id: %u (X: %f, Y: %f, Z: %f)", _owner->GetGUID().ToString().c_str(), id, destination.GetPositionX(), destination.GetPositionY(), destination.GetPositionZ()); - Add(new FormationMovementGenerator(id, destination, moveType, forceRun, forceOrientation)); + TC_LOG_DEBUG("movement.motionmaster", "MotionMaster::MoveFormation: '%s', started to move in a formation with leader %s", _owner->GetGUID().ToString().c_str(), leader->GetGUID().ToString().c_str()); + Add(new FormationMovementGenerator(leader, range, angle, point1, point2), MOTION_SLOT_DEFAULT); } } |