Core/Movement

* Moved enter/exit vehicle packets to spline.
* Fixed spline movement on transports such as elevators (for which we do not keep track of its exact position) - path will be using normal coordinates (not transport offsets)

4 files changed, 70 insertions, 55 deletions

diff --git a/src/server/game/Movement/Spline/MoveSplineFlag.h b/src/server/game/Movement/Spline/MoveSplineFlag.h
index 33973064e09..cfc2fdee450 100644
--- a/src/server/game/Movement/Spline/MoveSplineFlag.h
+++ b/src/server/game/Movement/Spline/MoveSplineFlag.h
@@ -34,43 +34,43 @@ namespace Movement
     {
     public:
         enum eFlags{
-            None         = 0x00000000,
-                                                 // x00-xFF(first byte) used as animation Ids storage in pair with Animation flag
-            Done         = 0x00000100,
-            Falling      = 0x00000200,           // Affects elevation computation, can't be combined with Parabolic flag
-            No_Spline    = 0x00000400,
-            Parabolic    = 0x00000800,           // Affects elevation computation, can't be combined with Falling flag
-            Walkmode     = 0x00001000,
-            Flying       = 0x00002000,           // Smooth movement(Catmullrom interpolation mode), flying animation
-            OrientationFixed = 0x00004000,       // Model orientation fixed
-            Final_Point  = 0x00008000,
-            Final_Target = 0x00010000,
-            Final_Angle  = 0x00020000,
-            Catmullrom   = 0x00040000,           // Used Catmullrom interpolation mode
-            Cyclic       = 0x00080000,           // Movement by cycled spline
-            Enter_Cycle  = 0x00100000,           // Everytimes appears with cyclic flag in monster move packet, erases first spline vertex after first cycle done
-            Animation    = 0x00200000,           // Plays animation after some time passed
-            Frozen       = 0x00400000,           // Will never arrive
-            Unknown5     = 0x00800000,
-            Unknown6     = 0x01000000,
-            Unknown7     = 0x02000000,
-            Unknown8     = 0x04000000,
+            None                = 0x00000000,
+                                                        // x00-xFF(first byte) used as animation Ids storage in pair with Animation flag
+            Done                = 0x00000100,
+            Falling             = 0x00000200,           // Affects elevation computation, can't be combined with Parabolic flag
+            No_Spline           = 0x00000400,
+            Parabolic           = 0x00000800,           // Affects elevation computation, can't be combined with Falling flag
+            Walkmode            = 0x00001000,
+            Flying              = 0x00002000,           // Smooth movement(Catmullrom interpolation mode), flying animation
+            OrientationFixed    = 0x00004000,           // Model orientation fixed
+            Final_Point         = 0x00008000,
+            Final_Target        = 0x00010000,
+            Final_Angle         = 0x00020000,
+            Catmullrom          = 0x00040000,           // Used Catmullrom interpolation mode
+            Cyclic              = 0x00080000,           // Movement by cycled spline
+            Enter_Cycle         = 0x00100000,           // Everytimes appears with cyclic flag in monster move packet, erases first spline vertex after first cycle done
+            Animation           = 0x00200000,           // Plays animation after some time passed
+            Frozen              = 0x00400000,           // Will never arrive
+            TransportEnter      = 0x00800000,
+            TransportExit       = 0x01000000,
+            Unknown7            = 0x02000000,
+            Unknown8            = 0x04000000,
             OrientationInversed = 0x08000000,
-            Unknown10    = 0x10000000,
-            Unknown11    = 0x20000000,
-            Unknown12    = 0x40000000,
-            Unknown13    = 0x80000000,
+            Unknown10           = 0x10000000,
+            Unknown11           = 0x20000000,
+            Unknown12           = 0x40000000,
+            Unknown13           = 0x80000000,
 
             // Masks
-            Mask_Final_Facing = Final_Point | Final_Target | Final_Angle,
+            Mask_Final_Facing   = Final_Point | Final_Target | Final_Angle,
             // animation ids stored here, see AnimType enum, used with Animation flag
-            Mask_Animations = 0xFF,
+            Mask_Animations     = 0xFF,
             // flags that shouldn't be appended into SMSG_MONSTER_MOVE\SMSG_MONSTER_MOVE_TRANSPORT packet, should be more probably
             Mask_No_Monster_Move = Mask_Final_Facing | Mask_Animations | Done,
             // CatmullRom interpolation mode used
-            Mask_CatmullRom = Flying | Catmullrom,
+            Mask_CatmullRom     = Flying | Catmullrom,
             // Unused, not suported flags
-            Mask_Unused = No_Spline|Enter_Cycle|Frozen|Unknown5|Unknown6|Unknown7|Unknown8|Unknown10|Unknown11|Unknown12|Unknown13,
+            Mask_Unused         = No_Spline|Enter_Cycle|Frozen|Unknown7|Unknown8|Unknown10|Unknown11|Unknown12|Unknown13,
         };
 
         inline uint32& raw() { return (uint32&)*this;}
@@ -98,14 +98,16 @@ namespace Movement
         void operator &= (uint32 f) { raw() &= f;}
         void operator |= (uint32 f) { raw() |= f;}
 
-        void EnableAnimation(uint8 anim) { raw() = (raw() & ~(Mask_Animations|Falling|Parabolic)) | Animation|anim;}
-        void EnableParabolic() { raw() = (raw() & ~(Mask_Animations|Falling|Animation)) | Parabolic;}
-        void EnableFalling() { raw() = (raw() & ~(Mask_Animations|Parabolic|Animation)) | Falling;}
+        void EnableAnimation(uint8 anim) { raw() = (raw() & ~(Mask_Animations | Falling | Parabolic)) | Animation | anim; }
+        void EnableParabolic() { raw() = (raw() & ~(Mask_Animations | Falling | Animation)) | Parabolic; }
+        void EnableFalling() { raw() = (raw() & ~(Mask_Animations | Parabolic | Animation)) | Falling; }
         void EnableFlying() { raw() = (raw() & ~Catmullrom) | Flying; }
         void EnableCatmullRom() { raw() = (raw() & ~Flying) | Catmullrom; }
-        void EnableFacingPoint() { raw() = (raw() & ~Mask_Final_Facing) | Final_Point;}
-        void EnableFacingAngle() { raw() = (raw() & ~Mask_Final_Facing) | Final_Angle;}
-        void EnableFacingTarget() { raw() = (raw() & ~Mask_Final_Facing) | Final_Target;}
+        void EnableFacingPoint() { raw() = (raw() & ~Mask_Final_Facing) | Final_Point; }
+        void EnableFacingAngle() { raw() = (raw() & ~Mask_Final_Facing) | Final_Angle; }
+        void EnableFacingTarget() { raw() = (raw() & ~Mask_Final_Facing) | Final_Target; }
+        void EnableTransportEnter() { raw() = (raw() & ~TransportExit) | TransportEnter; }
+        void EnableTransportExit() { raw() = (raw() & ~TransportEnter) | TransportExit; }
 
         uint8 animId       : 8;
         bool done          : 1;
@@ -123,8 +125,8 @@ namespace Movement
         bool enter_cycle   : 1;
         bool animation     : 1;
         bool frozen        : 1;
-        bool unknown5      : 1;
-        bool unknown6      : 1;
+        bool transportEnter: 1;
+        bool transportExit : 1;
         bool unknown7      : 1;
         bool unknown8      : 1;
         bool orientationInversed : 1;
diff --git a/src/server/game/Movement/Spline/MoveSplineInit.cpp b/src/server/game/Movement/Spline/MoveSplineInit.cpp
index c5f959e2f1d..ffc09a10e22 100644
--- a/src/server/game/Movement/Spline/MoveSplineInit.cpp
+++ b/src/server/game/Movement/Spline/MoveSplineInit.cpp
@@ -62,7 +62,8 @@ namespace Movement
 
         bool transport = false;
         Location real_position(unit.GetPositionX(), unit.GetPositionY(), unit.GetPositionZMinusOffset(), unit.GetOrientation());
-        if (unit.HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT))
+        // Elevators also use MOVEMENTFLAG_ONTRANSPORT but we do not keep track of their position changes
+        if (unit.HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) && unit.GetTransGUID())
         {
             transport = true;
             real_position.x = unit.GetTransOffsetX();
@@ -108,13 +109,7 @@ namespace Movement
         data.append(unit.GetPackGUID());
         if (transport)
         {
-            if (unit.GetVehicle())
-                data.appendPackGUID(unit.GetVehicleBase()->GetGUID());
-            else if (unit.GetTransport())
-                data.appendPackGUID(unit.GetTransGUID());
-            else
-                data << uint8(0);
-
+            data.appendPackGUID(unit.GetTransGUID());
             data << int8(unit.GetTransSeat());
         }
 
@@ -124,6 +119,8 @@ namespace Movement
 
     MoveSplineInit::MoveSplineInit(Unit& m) : unit(m)
     {
+        // Elevators also use MOVEMENTFLAG_ONTRANSPORT but we do not keep track of their position changes
+        args.TransformForTransport = unit.HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) && unit.GetTransGUID();
         // mix existing state into new
         args.flags.walkmode = unit.m_movementInfo.HasMovementFlag(MOVEMENTFLAG_WALKING);
         args.flags.flying = unit.m_movementInfo.HasMovementFlag((MovementFlags)(MOVEMENTFLAG_CAN_FLY|MOVEMENTFLAG_DISABLE_GRAVITY));
@@ -138,7 +135,7 @@ namespace Movement
 
     void MoveSplineInit::SetFacing(float angle)
     {
-        if (unit.HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT))
+        if (args.TransformForTransport)
         {
             if (Unit* vehicle = unit.GetVehicleBase())
                 angle -= vehicle->GetOrientation();
@@ -154,13 +151,13 @@ namespace Movement
     {
         args.path_Idx_offset = 0;
         args.path.resize(2);
-        TransportPathTransform transform(unit);
+        TransportPathTransform transform(unit, args.TransformForTransport);
         args.path[1] = transform(dest);
     }
 
     Vector3 TransportPathTransform::operator()(Vector3 input)
     {
-        if (_owner.HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT))
+        if (_transformForTransport)
         {
             if (Unit* vehicle = _owner.GetVehicleBase())
             {
@@ -177,5 +174,4 @@ namespace Movement
 
         return input;
     }
-
 }
diff --git a/src/server/game/Movement/Spline/MoveSplineInit.h b/src/server/game/Movement/Spline/MoveSplineInit.h
index 786324e3f77..ef847809ac8 100644
--- a/src/server/game/Movement/Spline/MoveSplineInit.h
+++ b/src/server/game/Movement/Spline/MoveSplineInit.h
@@ -37,11 +37,13 @@ namespace Movement
     class TransportPathTransform
     {
     public:
-        TransportPathTransform(Unit& owner) : _owner(owner) { }
+        TransportPathTransform(Unit& owner, bool transformForTransport)
+            : _owner(owner), _transformForTransport(transformForTransport) { }
         Vector3 operator()(Vector3 input);
 
     private:
         Unit& _owner;
+        bool _transformForTransport;
     };
 
     /*  Initializes and launches spline movement
@@ -107,6 +109,12 @@ namespace Movement
         /* Enables falling mode. Disabled by default
          */
         void SetFall();
+        /* Enters transport. Disabled by default
+         */
+        void SetTransportEnter();
+        /* Exits transport. Disabled by default
+         */
+        void SetTransportExit();
         /* Inverses unit model orientation. Disabled by default
          */
         void SetOrientationInversed();
@@ -123,31 +131,36 @@ namespace Movement
 
         PointsArray& Path() { return args.path; }
 
+        /* Disables transport coordinate transformations for cases where raw offsets are available
+        */
+        void DisableTransportPathTransformations();
     protected:
 
         MoveSplineInitArgs args;
         Unit&  unit;
     };
 
-    inline void MoveSplineInit::SetFly() { args.flags.EnableFlying();}
+    inline void MoveSplineInit::SetFly() { args.flags.EnableFlying(); }
     inline void MoveSplineInit::SetWalk(bool enable) { args.flags.walkmode = enable;}
     inline void MoveSplineInit::SetSmooth() { args.flags.EnableCatmullRom();}
     inline void MoveSplineInit::SetCyclic() { args.flags.cyclic = true;}
     inline void MoveSplineInit::SetFall() { args.flags.EnableFalling();}
     inline void MoveSplineInit::SetVelocity(float vel) { args.velocity = vel; args.HasVelocity = true; }
     inline void MoveSplineInit::SetOrientationInversed() { args.flags.orientationInversed = true;}
+    inline void MoveSplineInit::SetTransportEnter() { args.flags.EnableTransportEnter(); }
+    inline void MoveSplineInit::SetTransportExit() { args.flags.EnableTransportExit(); }
     inline void MoveSplineInit::SetOrientationFixed(bool enable) { args.flags.orientationFixed = enable;}
 
     inline void MoveSplineInit::MovebyPath(const PointsArray& controls, int32 path_offset)
     {
         args.path_Idx_offset = path_offset;
         args.path.resize(controls.size());
-        std::transform(controls.begin(), controls.end(), args.path.begin(), TransportPathTransform(unit));
+        std::transform(controls.begin(), controls.end(), args.path.begin(), TransportPathTransform(unit, args.TransformForTransport));
     }
 
     inline void MoveSplineInit::MoveTo(float x, float y, float z)
     {
-        Vector3 v(x,y,z);
+        Vector3 v(x, y, z);
         MoveTo(v);
     }
 
@@ -166,12 +179,14 @@ namespace Movement
 
     inline void MoveSplineInit::SetFacing(Vector3 const& spot)
     {
-        TransportPathTransform transform(unit);
+        TransportPathTransform transform(unit, args.TransformForTransport);
         Vector3 finalSpot = transform(spot);
         args.facing.f.x = finalSpot.x;
         args.facing.f.y = finalSpot.y;
         args.facing.f.z = finalSpot.z;
         args.flags.EnableFacingPoint();
     }
+
+    inline void MoveSplineInit::DisableTransportPathTransformations() { args.TransformForTransport = false; }
 }
 #endif // TRINITYSERVER_MOVESPLINEINIT_H
diff --git a/src/server/game/Movement/Spline/MoveSplineInitArgs.h b/src/server/game/Movement/Spline/MoveSplineInitArgs.h
index 74409c9562b..de02b35d0a0 100644
--- a/src/server/game/Movement/Spline/MoveSplineInitArgs.h
+++ b/src/server/game/Movement/Spline/MoveSplineInitArgs.h
@@ -42,7 +42,8 @@ namespace Movement
     struct MoveSplineInitArgs
     {
         MoveSplineInitArgs(size_t path_capacity = 16) : path_Idx_offset(0),
-            velocity(0.f), parabolic_amplitude(0.f), time_perc(0.f), splineId(0), initialOrientation(0.f), HasVelocity(false)
+            velocity(0.f), parabolic_amplitude(0.f), time_perc(0.f), splineId(0), initialOrientation(0.f),
+            HasVelocity(false), TransformForTransport(true)
         {
             path.reserve(path_capacity);
         }
@@ -57,6 +58,7 @@ namespace Movement
         uint32 splineId;
         float initialOrientation;
         bool HasVelocity;
+        bool TransformForTransport;
 
         /** Returns true to show that the arguments were configured correctly and MoveSpline initialization will succeed. */
         bool Validate() const;