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)

2 files changed, 12 insertions, 100 deletions

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index bb2d057bfaa..d415d06e76f 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -424,50 +424,6 @@ void Unit::DisableSpline()
     movespline->_Interrupt();
 }
 
-void Unit::SendMonsterMoveExitVehicle(Position const* newPos)
-{
-    WorldPacket data(SMSG_MONSTER_MOVE, 1+12+4+1+4+4+4+12+GetPackGUID().size());
-    data.append(GetPackGUID());
-
-    data << uint8(GetTypeId() == TYPEID_PLAYER ? 1 : 0);    // sets/unsets MOVEMENTFLAG2_UNK7 (0x40)
-    data << GetPositionX() << GetPositionY() << GetPositionZ();
-    data << getMSTime();
-
-    data << uint8(SPLINETYPE_FACING_ANGLE);
-    data << float(GetOrientation());                        // guess
-    data << uint32(SPLINEFLAG_TRANSPORT_EXIT);
-    data << uint32(0);                                      // Time in between points
-    data << uint32(1);                                      // 1 single waypoint
-    data << newPos->GetPositionX();
-    data << newPos->GetPositionY();
-    data << newPos->GetPositionZ();
-
-    SendMessageToSet(&data, true);
-}
-
-void Unit::SendMonsterMoveTransport(Unit* vehicleOwner)
-{
-    // TODO: Turn into BuildMonsterMoveTransport packet and allow certain variables (for npc movement aboard vehicles)
-    WorldPacket data(SMSG_MONSTER_MOVE_TRANSPORT, GetPackGUID().size()+vehicleOwner->GetPackGUID().size() + 47);
-    data.append(GetPackGUID());
-    data.append(vehicleOwner->GetPackGUID());
-    data << int8(GetTransSeat());
-    data << uint8(0);                                       // sets/unsets MOVEMENTFLAG2_UNK7 (0x40)
-    data << GetPositionX() - vehicleOwner->GetPositionX();
-    data << GetPositionY() - vehicleOwner->GetPositionY();
-    data << GetPositionZ() - vehicleOwner->GetPositionZ();
-    data << uint32(getMSTime());            // should be an increasing constant that indicates movement packet count
-    data << uint8(SPLINETYPE_FACING_ANGLE);
-    data << GetTransOffsetO();              // facing angle?
-    data << uint32(SPLINEFLAG_TRANSPORT);
-    data << uint32(GetTransTime());         // move time
-    data << uint32(1);                      // amount of waypoints
-    data << uint32(0);                      // waypoint X
-    data << uint32(0);                      // waypoint Y
-    data << uint32(0);                      // waypoint Z
-    SendMessageToSet(&data, true);
-}
-
 void Unit::resetAttackTimer(WeaponAttackType type)
 {
     m_attackTimer[type] = uint32(GetAttackTime(type) * m_modAttackSpeedPct[type]);
@@ -16308,7 +16264,7 @@ Creature* Unit::GetVehicleCreatureBase() const
 uint64 Unit::GetTransGUID() const
 {
     if (GetVehicle())
-        return GetVehicle()->GetBase()->GetGUID();
+        return GetVehicleBase()->GetGUID();
     if (GetTransport())
         return GetTransport()->GetGUID();
 
@@ -17171,11 +17127,12 @@ void Unit::_ExitVehicle(Position const* exitPosition)
     Vehicle* vehicle = m_vehicle;
     m_vehicle = NULL;
 
-    SetControlled(false, UNIT_STATE_ROOT);       // SMSG_MOVE_FORCE_UNROOT, ~MOVEMENTFLAG_ROOT
+    SetControlled(false, UNIT_STATE_ROOT);      // SMSG_MOVE_FORCE_UNROOT, ~MOVEMENTFLAG_ROOT
 
     Position pos;
-    if (!exitPosition)                           // Exit position not specified
-        vehicle->GetBase()->GetPosition(&pos);
+    if (!exitPosition)                          // Exit position not specified
+        vehicle->GetBase()->GetPosition(&pos);  // This should use passenger's current position, leaving it as it is now
+                                                // because we calculate positions incorrect (sometimes under map)
     else
         pos = *exitPosition;
 
@@ -17190,14 +17147,17 @@ void Unit::_ExitVehicle(Position const* exitPosition)
         SendMessageToSet(&data, false);
     }
 
-    SendMonsterMoveExitVehicle(&pos);
-    Relocate(&pos);
+    Movement::MoveSplineInit init(*this);
+    init.MoveTo(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ());
+    init.SetFacing(GetOrientation());
+    init.SetTransportExit();
+    init.Launch();
+
+    //GetMotionMaster()->MoveFall();            // Enable this once passenger positions are calculater properly (see above)
 
     if (Player* player = ToPlayer())
         player->ResummonPetTemporaryUnSummonedIfAny();
 
-    SendMovementFlagUpdate();
-
     if (vehicle->GetBase()->HasUnitTypeMask(UNIT_MASK_MINION))
         if (((Minion*)vehicle->GetBase())->GetOwner() == this)
             vehicle->Dismiss();
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
index 65a165b40d2..9b63de0cdb8 100755
--- a/src/server/game/Entities/Unit/Unit.h
+++ b/src/server/game/Entities/Unit/Unit.h
@@ -735,52 +735,6 @@ enum MovementFlags2
     MOVEMENTFLAG2_UNK16                    = 0x00008000,
 };
 
-enum SplineFlags
-{
-    SPLINEFLAG_NONE                 = 0x00000000,
-    SPLINEFLAG_FORWARD              = 0x00000001,
-    SPLINEFLAG_BACKWARD             = 0x00000002,
-    SPLINEFLAG_STRAFE_LEFT          = 0x00000004,
-    SPLINEFLAG_STRAFE_RIGHT         = 0x00000008,
-    SPLINEFLAG_TURN_LEFT            = 0x00000010,
-    SPLINEFLAG_TURN_RIGHT           = 0x00000020,
-    SPLINEFLAG_PITCH_UP             = 0x00000040,
-    SPLINEFLAG_PITCH_DOWN           = 0x00000080,
-    SPLINEFLAG_DONE                 = 0x00000100,
-    SPLINEFLAG_FALLING              = 0x00000200,
-    SPLINEFLAG_NO_SPLINE            = 0x00000400,
-    SPLINEFLAG_TRAJECTORY           = 0x00000800,
-    SPLINEFLAG_WALK_MODE            = 0x00001000,
-    SPLINEFLAG_FLYING               = 0x00002000,
-    SPLINEFLAG_KNOCKBACK            = 0x00004000,
-    SPLINEFLAG_FINAL_POINT          = 0x00008000,
-    SPLINEFLAG_FINAL_TARGET         = 0x00010000,
-    SPLINEFLAG_FINAL_FACING         = 0x00020000,
-    SPLINEFLAG_CATMULL_ROM          = 0x00040000,
-    SPLINEFLAG_CYCLIC               = 0x00080000,
-    SPLINEFLAG_ENTER_CYCLE          = 0x00100000,
-    SPLINEFLAG_ANIMATION_TIER       = 0x00200000,
-    SPLINEFLAG_FROZEN               = 0x00400000,
-    SPLINEFLAG_TRANSPORT            = 0x00800000,
-    SPLINEFLAG_TRANSPORT_EXIT       = 0x01000000,
-    SPLINEFLAG_UNKNOWN7             = 0x02000000,
-    SPLINEFLAG_UNKNOWN8             = 0x04000000,
-    SPLINEFLAG_ORIENTATION_INVERTED = 0x08000000,
-    SPLINEFLAG_USE_PATH_SMOOTHING   = 0x10000000,
-    SPLINEFLAG_ANIMATION            = 0x20000000,
-    SPLINEFLAG_UNCOMPRESSED_PATH    = 0x40000000,
-    SPLINEFLAG_UNKNOWN10            = 0x80000000,
-};
-
-enum SplineType
-{
-    SPLINETYPE_NORMAL               = 0,
-    SPLINETYPE_STOP                 = 1,
-    SPLINETYPE_FACING_SPOT          = 2,
-    SPLINETYPE_FACING_TARGET        = 3,
-    SPLINETYPE_FACING_ANGLE         = 4,
-};
-
 enum UnitTypeMask
 {
     UNIT_MASK_NONE                  = 0x00000000,
@@ -1662,9 +1616,7 @@ class Unit : public WorldObject
 
         void MonsterMoveWithSpeed(float x, float y, float z, float speed);
         //void SetFacing(float ori, WorldObject* obj = NULL);
-        void SendMonsterMoveExitVehicle(Position const* newPos);
         //void SendMonsterMove(float NewPosX, float NewPosY, float NewPosZ, uint8 type, uint32 MovementFlags, uint32 Time, Player* player = NULL);
-        void SendMonsterMoveTransport(Unit* vehicleOwner);
         void SendMovementFlagUpdate();
 
         /*! These methods send the same packet to the client in apply and unapply case.