Core/Movement: Defined movement force type enum

1 files changed, 4 insertions, 3 deletions

diff --git a/src/server/game/Server/Packets/MovementPackets.cpp b/src/server/game/Server/Packets/MovementPackets.cpp
index 7e2e142a630..c18c3ea5e1a 100644
--- a/src/server/game/Server/Packets/MovementPackets.cpp
+++ b/src/server/game/Server/Packets/MovementPackets.cpp
@@ -21,6 +21,7 @@
 #include "MovementTypedefs.h"
 #include "PacketUtilities.h"
 #include "Unit.h"
+#include "Util.h"
 
 ByteBuffer& operator<<(ByteBuffer& data, MovementInfo const& movementInfo)
 {
@@ -438,7 +439,7 @@ void WorldPackets::Movement::CommonMovement::WriteMovementForceWithDirection(Mov
 {
     data << movementForce.ID;
     data << movementForce.Origin;
-    if (movementForce.Type == 1 && objectPosition) // gravity
+    if (movementForce.Type == MovementForceType::Gravity && objectPosition)
     {
         TaggedPosition<Position::XYZ> direction;
         if (movementForce.Magnitude != 0.0f)
@@ -468,7 +469,7 @@ void WorldPackets::Movement::CommonMovement::WriteMovementForceWithDirection(Mov
 
     data << uint32(movementForce.TransportID);
     data << float(movementForce.Magnitude);
-    data.WriteBits(movementForce.Type, 2);
+    data.WriteBits(AsUnderlyingType(movementForce.Type), 2);
     data.WriteBit(movementForce.Unused910 != 0);
     data.FlushBits();
 
@@ -696,7 +697,7 @@ ByteBuffer& operator>>(ByteBuffer& data, MovementForce& movementForce)
     data >> movementForce.Direction;
     data >> movementForce.TransportID;
     data >> movementForce.Magnitude;
-    movementForce.Type = data.ReadBits(2);
+    movementForce.Type = MovementForceType(data.ReadBits(2));
     bool has910 = data.ReadBit();
     if (has910)
         data >> movementForce.Unused910;