switch to ImmediateMovementGenerator

Author: Shauren

src/server/game/Entities/Player/Player.cpp

@@ -1571,7 +1571,6 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
     SetUnitMovementFlags(GetUnitMovementFlags() & MOVEMENTFLAG_MASK_HAS_PLAYER_STATUS_OPCODE);
     DisableSpline();
     GetMotionMaster()->Remove(EFFECT_MOTION_TYPE);
-    GetMotionMaster()->Remove(FACE_MOTION_TYPE);
 
     if (Transport* transport = GetTransport())
     {

src/server/game/Entities/Unit/Unit.h

@@ -247,14 +247,13 @@ enum UnitState : uint32
     UNIT_STATE_FOLLOW_MOVE           = 0x08000000,
     UNIT_STATE_IGNORE_PATHFINDING    = 0x10000000, // do not use pathfinding in any MovementGenerator
     UNIT_STATE_FOLLOW_FORMATION_MOVE = 0x20000000,
-    UNIT_STATE_FACING                = 0x40000000,
 
     UNIT_STATE_ALL_STATE_SUPPORTED = UNIT_STATE_DIED | UNIT_STATE_MELEE_ATTACKING | UNIT_STATE_CHARMED | UNIT_STATE_STUNNED | UNIT_STATE_ROAMING | UNIT_STATE_CHASE
                                    | UNIT_STATE_FOCUSING | UNIT_STATE_FLEEING | UNIT_STATE_IN_FLIGHT | UNIT_STATE_FOLLOW | UNIT_STATE_ROOT | UNIT_STATE_CONFUSED
                                    | UNIT_STATE_DISTRACTED | UNIT_STATE_ISOLATED | UNIT_STATE_ATTACK_PLAYER | UNIT_STATE_CASTING
                                    | UNIT_STATE_POSSESSED | UNIT_STATE_CHARGING | UNIT_STATE_JUMPING | UNIT_STATE_MOVE | UNIT_STATE_ROTATING
                                    | UNIT_STATE_EVADE | UNIT_STATE_ROAMING_MOVE | UNIT_STATE_CONFUSED_MOVE | UNIT_STATE_FLEEING_MOVE
-                                   | UNIT_STATE_CHASE_MOVE | UNIT_STATE_FOLLOW_MOVE | UNIT_STATE_IGNORE_PATHFINDING | UNIT_STATE_FOLLOW_FORMATION_MOVE | UNIT_STATE_FACING,
+                                   | UNIT_STATE_CHASE_MOVE | UNIT_STATE_FOLLOW_MOVE | UNIT_STATE_IGNORE_PATHFINDING | UNIT_STATE_FOLLOW_FORMATION_MOVE,
 
     UNIT_STATE_UNATTACKABLE        = UNIT_STATE_IN_FLIGHT,
     UNIT_STATE_MOVING              = UNIT_STATE_ROAMING_MOVE | UNIT_STATE_CONFUSED_MOVE | UNIT_STATE_FLEEING_MOVE | UNIT_STATE_CHASE_MOVE | UNIT_STATE_FOLLOW_MOVE | UNIT_STATE_FOLLOW_FORMATION_MOVE,

src/server/game/Movement/MotionMaster.cpp

@@ -202,18 +202,6 @@ MovementGeneratorType MotionMaster::GetCurrentMovementGeneratorType() const
     return movement->GetMovementGeneratorType();
 }
 
-MovementGeneratorPriority MotionMaster::GetCurrentMovementGeneratorPriority() const
-{
-    if (Empty())
-        return MOTION_PRIORITY_NONE;
-
-    MovementGenerator const* movement = GetCurrentMovementGenerator();
-    if (!movement)
-        return MOTION_PRIORITY_NONE;
-
-    return MovementGeneratorPriority(movement->Priority);
-}
-
 MovementGeneratorType MotionMaster::GetCurrentMovementGeneratorType(MovementSlot slot) const
 {
     if (Empty() || IsInvalidMovementSlot(slot))
@@ -1045,47 +1033,35 @@ void MotionMaster::MoveFormation(Unit* leader, float range, float angle, uint32
     }
 }
 
-void MotionMaster::MoveFace(WorldObject const* object, uint32 id/* = EVENT_FACE*/)
+void MotionMaster::MoveFace(WorldObject const* object, uint32 id /*= EVENT_FACE*/)
 {
-    if (!object || GetCurrentMovementGeneratorPriority() == MOTION_PRIORITY_HIGHEST)
+    if (!object)
         return;
 
-    TC_LOG_DEBUG("movement.motionmaster", "MotionMaster::MoveFace: '{}', faces '{}'", _owner->GetGUID().ToString(), object->GetGUID().ToString());
+    TC_LOG_DEBUG("movement.motionmaster", "MotionMaster::MoveFace: '{}', faces '{}'", _owner->GetGUID(), object->GetGUID());
 
-    std::function<void(Movement::MoveSplineInit&)> initializer = [=, this](Movement::MoveSplineInit& init)
+    std::function<void(Movement::MoveSplineInit&)> initializer = [owner = _owner, object](Movement::MoveSplineInit& init)
     {
-        init.MoveTo(_owner->GetPositionX(), _owner->GetPositionY(), _owner->GetPositionZ(), false);
-        if (object)
-            init.SetFacing(_owner->GetAbsoluteAngle(object));   // when on transport, GetAbsoluteAngle will still return global coordinates (and angle) that needs transforming
+        init.MoveTo(owner->GetPositionX(), owner->GetPositionY(), owner->GetPositionZ(), false);
+        init.SetFacing(owner->GetAbsoluteAngle(object));   // when on transport, GetAbsoluteAngle will still return global coordinates (and angle) that needs transforming
     };
 
-    GenericMovementGenerator* movement = new GenericMovementGenerator(std::move(initializer), FACE_MOTION_TYPE, id);
-    movement->Priority = MOTION_PRIORITY_NORMAL;
-    movement->Mode = MOTION_MODE_OVERRIDE;
-    movement->BaseUnitState = UNIT_STATE_FACING;
-    Add(movement);
+    Add(new ImmediateMovementGenerator(std::move(initializer), FACE_MOTION_TYPE, id));
 }
 
-void MotionMaster::MoveFace(float const orientation, uint32 id/* = EVENT_FACE*/)
+void MotionMaster::MoveFace(float orientation, uint32 id /*= EVENT_FACE*/)
 {
-    if (GetCurrentMovementGeneratorPriority() == MOTION_PRIORITY_HIGHEST)
-        return;
+    TC_LOG_DEBUG("movement.motionmaster", "MotionMaster::MoveFace: '{}', faces '{}'", _owner->GetGUID(), orientation);
 
-    TC_LOG_DEBUG("movement.motionmaster", "MotionMaster::MoveFace: '{}', faces '{}'", _owner->GetGUID().ToString(), orientation);
-
-    std::function<void(Movement::MoveSplineInit&)> initializer = [=, this](Movement::MoveSplineInit& init)
+    std::function<void(Movement::MoveSplineInit&)> initializer = [owner = _owner, orientation](Movement::MoveSplineInit& init)
     {
-        init.MoveTo(_owner->GetPositionX(), _owner->GetPositionY(), _owner->GetPositionZ(), false);
-        if (_owner->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) && !_owner->GetTransGUID().IsEmpty())
+        init.MoveTo(owner->GetPositionX(), owner->GetPositionY(), owner->GetPositionZ(), false);
+        if (owner->GetTransport())
             init.DisableTransportPathTransformations(); // It makes no sense to target global orientation
         init.SetFacing(orientation);
     };
 
-    GenericMovementGenerator* movement = new GenericMovementGenerator(std::move(initializer), FACE_MOTION_TYPE, id);
-    movement->Priority = MOTION_PRIORITY_NORMAL;
-    movement->Mode = MOTION_MODE_OVERRIDE;
-    movement->BaseUnitState = UNIT_STATE_FACING;
-    Add(movement);
+    Add(new ImmediateMovementGenerator(std::move(initializer), FACE_MOTION_TYPE, id));
 }
 
 void MotionMaster::LaunchMoveSpline(std::function<void(Movement::MoveSplineInit& init)>&& initializer, uint32 id/*= 0*/, MovementGeneratorPriority priority/* = MOTION_PRIORITY_NORMAL*/, MovementGeneratorType type/*= EFFECT_MOTION_TYPE*/)

src/server/game/Movement/MotionMaster.h

@@ -124,7 +124,6 @@ class TC_GAME_API MotionMaster
         MovementSlot GetCurrentSlot() const;
         MovementGenerator* GetCurrentMovementGenerator() const;
         MovementGeneratorType GetCurrentMovementGeneratorType() const;
-        MovementGeneratorPriority GetCurrentMovementGeneratorPriority() const;
         MovementGeneratorType GetCurrentMovementGeneratorType(MovementSlot slot) const;
         MovementGenerator* GetCurrentMovementGenerator(MovementSlot slot) const;
         // Returns first found MovementGenerator that matches the given criteria
@@ -192,7 +191,7 @@ class TC_GAME_API MotionMaster
         void MoveRotate(uint32 id, uint32 time, RotateDirection direction);
         void MoveFormation(Unit* leader, float range, float angle, uint32 point1, uint32 point2);
         void MoveFace(WorldObject const* object, uint32 id = EVENT_FACE);
-        void MoveFace(float const orientation, uint32 id = EVENT_FACE);
+        void MoveFace(float orientation, uint32 id = EVENT_FACE);
 
         void LaunchMoveSpline(std::function<void(Movement::MoveSplineInit& init)>&& initializer, uint32 id = 0, MovementGeneratorPriority priority = MOTION_PRIORITY_NORMAL, MovementGeneratorType type = EFFECT_MOTION_TYPE);
     private: