mirror of
https://github.com/Kelsidavis/WoWee.git
synced 2026-04-05 04:33:51 +00:00
refactor: replace 37 reinterpret_cast writeBytes with writeFloat
Replace 37 verbose reinterpret_cast<const uint8_t*> float writes with the existing Packet::writeFloat() method across world_packets, packet_parsers_classic, and packet_parsers_tbc.
This commit is contained in:
parent
58839e611e
commit
3f54d8bcb8
3 changed files with 40 additions and 40 deletions
|
|
@ -355,10 +355,10 @@ void ClassicPacketParsers::writeMovementPayload(network::Packet& packet, const M
|
|||
packet.writeUInt32(info.time);
|
||||
|
||||
// Position
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.x), sizeof(float));
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.y), sizeof(float));
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.z), sizeof(float));
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.orientation), sizeof(float));
|
||||
packet.writeFloat(info.x);
|
||||
packet.writeFloat(info.y);
|
||||
packet.writeFloat(info.z);
|
||||
packet.writeFloat(info.orientation);
|
||||
|
||||
// Transport data (Classic ONTRANSPORT = 0x02000000, no timestamp)
|
||||
if (wireFlags & ClassicMoveFlags::ONTRANSPORT) {
|
||||
|
|
@ -379,10 +379,10 @@ void ClassicPacketParsers::writeMovementPayload(network::Packet& packet, const M
|
|||
}
|
||||
|
||||
// Transport local position
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.transportX), sizeof(float));
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.transportY), sizeof(float));
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.transportZ), sizeof(float));
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.transportO), sizeof(float));
|
||||
packet.writeFloat(info.transportX);
|
||||
packet.writeFloat(info.transportY);
|
||||
packet.writeFloat(info.transportZ);
|
||||
packet.writeFloat(info.transportO);
|
||||
|
||||
// Classic: NO transport timestamp
|
||||
// Classic: NO transport seat byte
|
||||
|
|
@ -390,7 +390,7 @@ void ClassicPacketParsers::writeMovementPayload(network::Packet& packet, const M
|
|||
|
||||
// Pitch (Classic: only SWIMMING)
|
||||
if (wireFlags & ClassicMoveFlags::SWIMMING) {
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.pitch), sizeof(float));
|
||||
packet.writeFloat(info.pitch);
|
||||
}
|
||||
|
||||
// Fall time (always present)
|
||||
|
|
@ -398,10 +398,10 @@ void ClassicPacketParsers::writeMovementPayload(network::Packet& packet, const M
|
|||
|
||||
// Jump data (Classic JUMPING = 0x2000)
|
||||
if (wireFlags & ClassicMoveFlags::JUMPING) {
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.jumpVelocity), sizeof(float));
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.jumpSinAngle), sizeof(float));
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.jumpCosAngle), sizeof(float));
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.jumpXYSpeed), sizeof(float));
|
||||
packet.writeFloat(info.jumpVelocity);
|
||||
packet.writeFloat(info.jumpSinAngle);
|
||||
packet.writeFloat(info.jumpCosAngle);
|
||||
packet.writeFloat(info.jumpXYSpeed);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -228,10 +228,10 @@ void TbcPacketParsers::writeMovementPayload(network::Packet& packet, const Movem
|
|||
packet.writeUInt32(info.time);
|
||||
|
||||
// Position
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.x), sizeof(float));
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.y), sizeof(float));
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.z), sizeof(float));
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.orientation), sizeof(float));
|
||||
packet.writeFloat(info.x);
|
||||
packet.writeFloat(info.y);
|
||||
packet.writeFloat(info.z);
|
||||
packet.writeFloat(info.orientation);
|
||||
|
||||
// Transport data (TBC ON_TRANSPORT = 0x200, same bit as WotLK)
|
||||
if (info.flags & TbcMoveFlags::ON_TRANSPORT) {
|
||||
|
|
@ -252,10 +252,10 @@ void TbcPacketParsers::writeMovementPayload(network::Packet& packet, const Movem
|
|||
}
|
||||
|
||||
// Transport local position
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.transportX), sizeof(float));
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.transportY), sizeof(float));
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.transportZ), sizeof(float));
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.transportO), sizeof(float));
|
||||
packet.writeFloat(info.transportX);
|
||||
packet.writeFloat(info.transportY);
|
||||
packet.writeFloat(info.transportZ);
|
||||
packet.writeFloat(info.transportO);
|
||||
|
||||
// Transport time
|
||||
packet.writeUInt32(info.transportTime);
|
||||
|
|
@ -266,9 +266,9 @@ void TbcPacketParsers::writeMovementPayload(network::Packet& packet, const Movem
|
|||
|
||||
// Pitch: SWIMMING or else ONTRANSPORT (TBC flag positions)
|
||||
if (info.flags & TbcMoveFlags::SWIMMING) {
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.pitch), sizeof(float));
|
||||
packet.writeFloat(info.pitch);
|
||||
} else if (info.flags & TbcMoveFlags::ONTRANSPORT) {
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.pitch), sizeof(float));
|
||||
packet.writeFloat(info.pitch);
|
||||
}
|
||||
|
||||
// Fall time (always present)
|
||||
|
|
@ -276,10 +276,10 @@ void TbcPacketParsers::writeMovementPayload(network::Packet& packet, const Movem
|
|||
|
||||
// Jump data (TBC JUMPING = 0x2000, WotLK FALLING = 0x1000)
|
||||
if (info.flags & TbcMoveFlags::JUMPING) {
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.jumpVelocity), sizeof(float));
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.jumpSinAngle), sizeof(float));
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.jumpCosAngle), sizeof(float));
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.jumpXYSpeed), sizeof(float));
|
||||
packet.writeFloat(info.jumpVelocity);
|
||||
packet.writeFloat(info.jumpSinAngle);
|
||||
packet.writeFloat(info.jumpCosAngle);
|
||||
packet.writeFloat(info.jumpXYSpeed);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -761,12 +761,12 @@ void MovementPacket::writeMovementPayload(network::Packet& packet, const Movemen
|
|||
packet.writeUInt32(info.time);
|
||||
|
||||
// Write position
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.x), sizeof(float));
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.y), sizeof(float));
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.z), sizeof(float));
|
||||
packet.writeFloat(info.x);
|
||||
packet.writeFloat(info.y);
|
||||
packet.writeFloat(info.z);
|
||||
|
||||
// Write orientation
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.orientation), sizeof(float));
|
||||
packet.writeFloat(info.orientation);
|
||||
|
||||
// Write transport data if on transport.
|
||||
// 3.3.5a ordering: transport block appears before pitch/fall/jump.
|
||||
|
|
@ -788,10 +788,10 @@ void MovementPacket::writeMovementPayload(network::Packet& packet, const Movemen
|
|||
}
|
||||
|
||||
// Write transport local position
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.transportX), sizeof(float));
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.transportY), sizeof(float));
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.transportZ), sizeof(float));
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.transportO), sizeof(float));
|
||||
packet.writeFloat(info.transportX);
|
||||
packet.writeFloat(info.transportY);
|
||||
packet.writeFloat(info.transportZ);
|
||||
packet.writeFloat(info.transportO);
|
||||
|
||||
// Write transport time
|
||||
packet.writeUInt32(info.transportTime);
|
||||
|
|
@ -807,7 +807,7 @@ void MovementPacket::writeMovementPayload(network::Packet& packet, const Movemen
|
|||
|
||||
// Write pitch if swimming/flying
|
||||
if (info.hasFlag(MovementFlags::SWIMMING) || info.hasFlag(MovementFlags::FLYING)) {
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.pitch), sizeof(float));
|
||||
packet.writeFloat(info.pitch);
|
||||
}
|
||||
|
||||
// Fall time is ALWAYS present in the packet (server reads it unconditionally).
|
||||
|
|
@ -815,10 +815,10 @@ void MovementPacket::writeMovementPayload(network::Packet& packet, const Movemen
|
|||
packet.writeUInt32(info.fallTime);
|
||||
|
||||
if (info.hasFlag(MovementFlags::FALLING)) {
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.jumpVelocity), sizeof(float));
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.jumpSinAngle), sizeof(float));
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.jumpCosAngle), sizeof(float));
|
||||
packet.writeBytes(reinterpret_cast<const uint8_t*>(&info.jumpXYSpeed), sizeof(float));
|
||||
packet.writeFloat(info.jumpVelocity);
|
||||
packet.writeFloat(info.jumpSinAngle);
|
||||
packet.writeFloat(info.jumpCosAngle);
|
||||
packet.writeFloat(info.jumpXYSpeed);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue