Core/PacketIO: Renamed "movementInfo" to "Status" in movement packets in effort to preserve original naming (and to follow codestyle for naming public data members)

7 files changed, 49 insertions, 49 deletions

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index e20d1dc1429..2695d4218d3 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -27033,7 +27033,7 @@ void Player::SendMovementSetCollisionHeight(float height)
     SendDirectMessage(setCollisionHeight.Write());
 
     WorldPackets::Movement::MoveUpdateCollisionHeight updateCollisionHeight;
-    updateCollisionHeight.movementInfo = &m_movementInfo;
+    updateCollisionHeight.Status = &m_movementInfo;
     updateCollisionHeight.Height = height;
     updateCollisionHeight.Scale = GetObjectScale();
     SendMessageToSet(updateCollisionHeight.Write(), false);
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 3c0d1a318a4..154c6560eea 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -8485,7 +8485,7 @@ void Unit::SetSpeedRate(UnitMoveType mtype, float rate)
 
         // Send notification to other players
         WorldPackets::Movement::MoveUpdateSpeed packet(moveTypeToOpcode[mtype][2]);
-        packet.movementInfo = &m_movementInfo;
+        packet.Status = &m_movementInfo;
         packet.Speed = GetSpeed(mtype);
         playerMover->SendMessageToSet(packet.Write(), false);
     }
@@ -11370,7 +11370,7 @@ void Unit::SetRooted(bool apply, bool packetOnly /*= false*/)
         playerMover->SendDirectMessage(packet.Write());
 
         WorldPackets::Movement::MoveUpdate moveUpdate;
-        moveUpdate.movementInfo = &m_movementInfo;
+        moveUpdate.Status = &m_movementInfo;
         SendMessageToSet(moveUpdate.Write(), playerMover);
     }
     else
@@ -13021,7 +13021,7 @@ void Unit::SendTeleportPacket(Position const& pos)
     // SMSG_MOVE_TELEPORT is sent to self in order to trigger CMSG_MOVE_TELEPORT_ACK and update the position server side
 
     WorldPackets::Movement::MoveUpdateTeleport moveUpdateTeleport;
-    moveUpdateTeleport.movementInfo = &m_movementInfo;
+    moveUpdateTeleport.Status = &m_movementInfo;
     Unit* broadcastSource = this;
 
     if (Player* playerMover = GetPlayerBeingMoved())
@@ -13045,9 +13045,9 @@ void Unit::SendTeleportPacket(Position const& pos)
     {
         // This is the only packet sent for creatures which contains MovementInfo structure
         // we do not update m_movementInfo for creatures so it needs to be done manually here
-        moveUpdateTeleport.movementInfo->guid = GetGUID();
-        moveUpdateTeleport.movementInfo->pos.Relocate(pos);
-        moveUpdateTeleport.movementInfo->time = getMSTime();
+        moveUpdateTeleport.Status->guid = GetGUID();
+        moveUpdateTeleport.Status->pos.Relocate(pos);
+        moveUpdateTeleport.Status->time = getMSTime();
     }
 
     // Broadcast the packet to everyone except self.
@@ -13435,7 +13435,7 @@ bool Unit::SetDisableGravity(bool disable)
         playerMover->SendDirectMessage(packet.Write());
 
         WorldPackets::Movement::MoveUpdate moveUpdate;
-        moveUpdate.movementInfo = &m_movementInfo;
+        moveUpdate.Status = &m_movementInfo;
         SendMessageToSet(moveUpdate.Write(), playerMover);
     }
     else
@@ -13513,7 +13513,7 @@ bool Unit::SetCanFly(bool enable)
         playerMover->SendDirectMessage(packet.Write());
 
         WorldPackets::Movement::MoveUpdate moveUpdate;
-        moveUpdate.movementInfo = &m_movementInfo;
+        moveUpdate.Status = &m_movementInfo;
         SendMessageToSet(moveUpdate.Write(), playerMover);
     }
     else
@@ -13550,7 +13550,7 @@ bool Unit::SetWaterWalking(bool enable)
         playerMover->SendDirectMessage(packet.Write());
 
         WorldPackets::Movement::MoveUpdate moveUpdate;
-        moveUpdate.movementInfo = &m_movementInfo;
+        moveUpdate.Status = &m_movementInfo;
         SendMessageToSet(moveUpdate.Write(), playerMover);
     }
     else
@@ -13587,7 +13587,7 @@ bool Unit::SetFeatherFall(bool enable)
         playerMover->SendDirectMessage(packet.Write());
 
         WorldPackets::Movement::MoveUpdate moveUpdate;
-        moveUpdate.movementInfo = &m_movementInfo;
+        moveUpdate.Status = &m_movementInfo;
         SendMessageToSet(moveUpdate.Write(), playerMover);
     }
     else
@@ -13639,7 +13639,7 @@ bool Unit::SetHover(bool enable)
         playerMover->SendDirectMessage(packet.Write());
 
         WorldPackets::Movement::MoveUpdate moveUpdate;
-        moveUpdate.movementInfo = &m_movementInfo;
+        moveUpdate.Status = &m_movementInfo;
         SendMessageToSet(moveUpdate.Write(), playerMover);
     }
     else
@@ -13676,7 +13676,7 @@ bool Unit::SetCollision(bool disable)
         playerMover->SendDirectMessage(packet.Write());
 
         WorldPackets::Movement::MoveUpdate moveUpdate;
-        moveUpdate.movementInfo = &m_movementInfo;
+        moveUpdate.Status = &m_movementInfo;
         SendMessageToSet(moveUpdate.Write(), playerMover);
     }
     else
@@ -13716,7 +13716,7 @@ bool Unit::SetCanTransitionBetweenSwimAndFly(bool enable)
         playerMover->SendDirectMessage(packet.Write());
 
         WorldPackets::Movement::MoveUpdate moveUpdate;
-        moveUpdate.movementInfo = &m_movementInfo;
+        moveUpdate.Status = &m_movementInfo;
         SendMessageToSet(moveUpdate.Write(), playerMover);
     }
 
@@ -13747,7 +13747,7 @@ bool Unit::SetCanTurnWhileFalling(bool enable)
         playerMover->SendDirectMessage(packet.Write());
 
         WorldPackets::Movement::MoveUpdate moveUpdate;
-        moveUpdate.movementInfo = &m_movementInfo;
+        moveUpdate.Status = &m_movementInfo;
         SendMessageToSet(moveUpdate.Write(), playerMover);
     }
 
@@ -13778,7 +13778,7 @@ bool Unit::SetCanDoubleJump(bool enable)
         playerMover->SendDirectMessage(packet.Write());
 
         WorldPackets::Movement::MoveUpdate moveUpdate;
-        moveUpdate.movementInfo = &m_movementInfo;
+        moveUpdate.Status = &m_movementInfo;
         SendMessageToSet(moveUpdate.Write(), playerMover);
     }
 
diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp
index 3ac094c3779..03cca539025 100644
--- a/src/server/game/Handlers/MovementHandler.cpp
+++ b/src/server/game/Handlers/MovementHandler.cpp
@@ -289,7 +289,7 @@ void WorldSession::HandleMoveTeleportAck(WorldPackets::Movement::MoveTeleportAck
 
 void WorldSession::HandleMovementOpcodes(WorldPackets::Movement::ClientPlayerMovement& packet)
 {
-    HandleMovementOpcode(packet.GetOpcode(), packet.movementInfo);
+    HandleMovementOpcode(packet.GetOpcode(), packet.Status);
 }
 
 void WorldSession::HandleMovementOpcode(OpcodeClient opcode, MovementInfo& movementInfo)
@@ -408,7 +408,7 @@ void WorldSession::HandleMovementOpcode(OpcodeClient opcode, MovementInfo& movem
     mover->UpdatePosition(movementInfo.pos);
 
     WorldPackets::Movement::MoveUpdate moveUpdate;
-    moveUpdate.movementInfo = &mover->m_movementInfo;
+    moveUpdate.Status = &mover->m_movementInfo;
     mover->SendMessageToSet(moveUpdate.Write(), _player);
 
     if (plrMover)                                            // nothing is charmed, or player charmed
@@ -445,10 +445,10 @@ void WorldSession::HandleMovementOpcode(OpcodeClient opcode, MovementInfo& movem
 void WorldSession::HandleForceSpeedChangeAck(WorldPackets::Movement::MovementSpeedAck& packet)
 {
 
-    GetPlayer()->ValidateMovementInfo(&packet.Ack.movementInfo);
+    GetPlayer()->ValidateMovementInfo(&packet.Ack.Status);
 
     // now can skip not our packet
-    if (_player->GetGUID() != packet.Ack.movementInfo.guid)
+    if (_player->GetGUID() != packet.Ack.Status.guid)
         return;
 
     /*----------------*/
@@ -524,21 +524,21 @@ void WorldSession::HandleSetActiveMoverOpcode(WorldPackets::Movement::SetActiveM
 
 void WorldSession::HandleMoveKnockBackAck(WorldPackets::Movement::MoveKnockBackAck& movementAck)
 {
-    GetPlayer()->ValidateMovementInfo(&movementAck.Ack.movementInfo);
+    GetPlayer()->ValidateMovementInfo(&movementAck.Ack.Status);
 
-    if (_player->m_unitMovedByMe->GetGUID() != movementAck.Ack.movementInfo.guid)
+    if (_player->m_unitMovedByMe->GetGUID() != movementAck.Ack.Status.guid)
         return;
 
-    _player->m_movementInfo = movementAck.Ack.movementInfo;
+    _player->m_movementInfo = movementAck.Ack.Status;
 
     WorldPackets::Movement::MoveUpdateKnockBack updateKnockBack;
-    updateKnockBack.movementInfo = &_player->m_movementInfo;
+    updateKnockBack.Status = &_player->m_movementInfo;
     _player->SendMessageToSet(updateKnockBack.Write(), false);
 }
 
 void WorldSession::HandleMovementAckMessage(WorldPackets::Movement::MovementAckMessage& movementAck)
 {
-    GetPlayer()->ValidateMovementInfo(&movementAck.Ack.movementInfo);
+    GetPlayer()->ValidateMovementInfo(&movementAck.Ack.Status);
 }
 
 void WorldSession::HandleSummonResponseOpcode(WorldPackets::Movement::SummonResponse& packet)
@@ -551,7 +551,7 @@ void WorldSession::HandleSummonResponseOpcode(WorldPackets::Movement::SummonResp
 
 void WorldSession::HandleSetCollisionHeightAck(WorldPackets::Movement::MoveSetCollisionHeightAck& setCollisionHeightAck)
 {
-    GetPlayer()->ValidateMovementInfo(&setCollisionHeightAck.Data.movementInfo);
+    GetPlayer()->ValidateMovementInfo(&setCollisionHeightAck.Data.Status);
 }
 
 void WorldSession::HandleMoveTimeSkippedOpcode(WorldPackets::Movement::MoveTimeSkipped& /*moveTimeSkipped*/)
@@ -560,7 +560,7 @@ void WorldSession::HandleMoveTimeSkippedOpcode(WorldPackets::Movement::MoveTimeS
 
 void WorldSession::HandleMoveSplineDoneOpcode(WorldPackets::Movement::MoveSplineDone& moveSplineDone)
 {
-    MovementInfo movementInfo = moveSplineDone.movementInfo;
+    MovementInfo movementInfo = moveSplineDone.Status;
     _player->ValidateMovementInfo(&movementInfo);
 
     // in taxi flight packet received in 2 case:
diff --git a/src/server/game/Handlers/VehicleHandler.cpp b/src/server/game/Handlers/VehicleHandler.cpp
index 007ca5a67f3..7d83805b520 100644
--- a/src/server/game/Handlers/VehicleHandler.cpp
+++ b/src/server/game/Handlers/VehicleHandler.cpp
@@ -188,5 +188,5 @@ void WorldSession::HandleRequestVehicleExit(WorldPackets::Vehicle::RequestVehicl
 
 void WorldSession::HandleMoveSetVehicleRecAck(WorldPackets::Vehicle::MoveSetVehicleRecIdAck& setVehicleRecIdAck)
 {
-    GetPlayer()->ValidateMovementInfo(&setVehicleRecIdAck.Data.movementInfo);
+    GetPlayer()->ValidateMovementInfo(&setVehicleRecIdAck.Data.Status);
 }
diff --git a/src/server/game/Server/Packets/MovementPackets.cpp b/src/server/game/Server/Packets/MovementPackets.cpp
index 8bebc63711a..74f188179ef 100644
--- a/src/server/game/Server/Packets/MovementPackets.cpp
+++ b/src/server/game/Server/Packets/MovementPackets.cpp
@@ -181,7 +181,7 @@ ByteBuffer& operator<<(ByteBuffer& data, MovementInfo::TransportInfo const& tran
 
 void WorldPackets::Movement::ClientPlayerMovement::Read()
 {
-    _worldPacket >> movementInfo;
+    _worldPacket >> Status;
 }
 
 ByteBuffer& WorldPackets::operator<<(ByteBuffer& data, Movement::MonsterSplineFilterKey const& monsterSplineFilterKey)
@@ -469,7 +469,7 @@ WorldPacket const* WorldPackets::Movement::MoveSetSpeed::Write()
 
 WorldPacket const* WorldPackets::Movement::MoveUpdateSpeed::Write()
 {
-    _worldPacket << *movementInfo;
+    _worldPacket << *Status;
     _worldPacket << Speed;
     return &_worldPacket;
 }
@@ -489,7 +489,7 @@ WorldPacket const* WorldPackets::Movement::MoveSetFlag::Write()
 
 WorldPacket const* WorldPackets::Movement::MoveUpdate::Write()
 {
-    _worldPacket << *movementInfo;
+    _worldPacket << *Status;
 
     return &_worldPacket;
 }
@@ -573,7 +573,7 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Movement::MovementForce c
 
 WorldPacket const* WorldPackets::Movement::MoveUpdateTeleport::Write()
 {
-    _worldPacket << *movementInfo;
+    _worldPacket << *Status;
 
     _worldPacket << uint32(MovementForces.size());
     _worldPacket.WriteBit(WalkSpeed.is_initialized());
@@ -629,7 +629,7 @@ void WorldPackets::Movement::MoveTeleportAck::Read()
 
 ByteBuffer& operator>>(ByteBuffer& data, WorldPackets::Movement::MovementAck& ack)
 {
-    data >> ack.movementInfo;
+    data >> ack.Status;
     data >> ack.AckIndex;
     return data;
 }
@@ -685,7 +685,7 @@ WorldPacket const* WorldPackets::Movement::MoveKnockBack::Write()
 
 WorldPacket const* WorldPackets::Movement::MoveUpdateKnockBack::Write()
 {
-    _worldPacket << *movementInfo;
+    _worldPacket << *Status;
 
     return &_worldPacket;
 }
@@ -717,7 +717,7 @@ WorldPacket const* WorldPackets::Movement::MoveSetCollisionHeight::Write()
 
 WorldPacket const* WorldPackets::Movement::MoveUpdateCollisionHeight::Write()
 {
-    _worldPacket << *movementInfo;
+    _worldPacket << *Status;
     _worldPacket << float(Height);
     _worldPacket << float(Scale);
 
@@ -726,7 +726,7 @@ WorldPacket const* WorldPackets::Movement::MoveUpdateCollisionHeight::Write()
 
 WorldPacket const* WorldPackets::Movement::MoveUpdateRemoveMovementForce::Write()
 {
-    _worldPacket << *movementInfo;
+    _worldPacket << *Status;
     _worldPacket << TriggerGUID;
 
     return &_worldPacket;
@@ -734,7 +734,7 @@ WorldPacket const* WorldPackets::Movement::MoveUpdateRemoveMovementForce::Write(
 
 WorldPacket const* WorldPackets::Movement::MoveUpdateApplyMovementForce::Write()
 {
-    _worldPacket << *movementInfo;
+    _worldPacket << *Status;
     _worldPacket << Force;
 
     return &_worldPacket;
@@ -771,7 +771,7 @@ WorldPacket const* WorldPackets::Movement::ControlUpdate::Write()
 
 void WorldPackets::Movement::MoveSplineDone::Read()
 {
-    _worldPacket >> movementInfo;
+    _worldPacket >> Status;
     _worldPacket >> SplineID;
 }
 
diff --git a/src/server/game/Server/Packets/MovementPackets.h b/src/server/game/Server/Packets/MovementPackets.h
index 328ea1845dd..51687f75e74 100644
--- a/src/server/game/Server/Packets/MovementPackets.h
+++ b/src/server/game/Server/Packets/MovementPackets.h
@@ -40,7 +40,7 @@ namespace WorldPackets
 
             void Read() override;
 
-            MovementInfo movementInfo;
+            MovementInfo Status;
         };
 
         class TC_GAME_API MoveUpdate final : public ServerPacket
@@ -50,7 +50,7 @@ namespace WorldPackets
 
             WorldPacket const* Write() override;
 
-            MovementInfo* movementInfo = nullptr;
+            MovementInfo* Status = nullptr;
         };
 
         struct MonsterSplineFilterKey
@@ -160,7 +160,7 @@ namespace WorldPackets
 
             WorldPacket const* Write() override;
 
-            MovementInfo* movementInfo = nullptr;
+            MovementInfo* Status = nullptr;
             float Speed = 1.0f;
         };
 
@@ -277,7 +277,7 @@ namespace WorldPackets
 
             WorldPacket const* Write() override;
 
-            MovementInfo* movementInfo = nullptr;
+            MovementInfo* Status = nullptr;
             std::vector<MovementForce> MovementForces;
             Optional<float> SwimBackSpeed;
             Optional<float> FlightSpeed;
@@ -297,7 +297,7 @@ namespace WorldPackets
 
             WorldPacket const* Write() override;
 
-            MovementInfo* movementInfo = nullptr;
+            MovementInfo* Status = nullptr;
             MovementForce Force;
         };
 
@@ -308,7 +308,7 @@ namespace WorldPackets
 
             WorldPacket const* Write() override;
 
-            MovementInfo* movementInfo = nullptr;
+            MovementInfo* Status = nullptr;
             ObjectGuid TriggerGUID;
         };
 
@@ -326,7 +326,7 @@ namespace WorldPackets
 
         struct MovementAck
         {
-            MovementInfo movementInfo;
+            MovementInfo Status;
             int32 AckIndex = 0;
         };
 
@@ -397,7 +397,7 @@ namespace WorldPackets
 
             WorldPacket const* Write() override;
 
-            MovementInfo* movementInfo = nullptr;
+            MovementInfo* Status = nullptr;
         };
 
         class MoveKnockBackAck final : public ClientPacket
@@ -441,7 +441,7 @@ namespace WorldPackets
 
             WorldPacket const* Write() override;
 
-            MovementInfo* movementInfo = nullptr;
+            MovementInfo* Status = nullptr;
             float Scale = 1.0f;
             float Height = 1.0f;
         };
@@ -499,7 +499,7 @@ namespace WorldPackets
 
             void Read() override;
 
-            MovementInfo movementInfo;
+            MovementInfo Status;
             int32 SplineID = 0;
         };
 
diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp
index b349e1574b0..ec9c4811e4c 100644
--- a/src/server/scripts/Commands/cs_debug.cpp
+++ b/src/server/scripts/Commands/cs_debug.cpp
@@ -1352,7 +1352,7 @@ public:
             else
             {
                 WorldPackets::Movement::MoveUpdate moveUpdate;
-                moveUpdate.movementInfo = &target->m_movementInfo;
+                moveUpdate.Status = &target->m_movementInfo;
                 target->SendMessageToSet(moveUpdate.Write(), true);
             }