From e5bdc6612d2b7c289ae27829ed7b78254e0a61e3 Mon Sep 17 00:00:00 2001 From: Rat Date: Thu, 19 Jan 2012 12:59:28 +0100 Subject: [PATCH] Core/Packets: Moved Bit related functions to ByteBuffer from WorldPacket --- src/server/game/Server/WorldPacket.h | 22 ---------------------- src/server/shared/Packets/ByteBuffer.h | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/server/game/Server/WorldPacket.h b/src/server/game/Server/WorldPacket.h index a005a1b57f..f648e905bf 100644 --- a/src/server/game/Server/WorldPacket.h +++ b/src/server/game/Server/WorldPacket.h @@ -50,28 +50,6 @@ class WorldPacket : public ByteBuffer void SetOpcode(Opcodes opcode) { m_opcode = opcode; } void Compress(Opcodes opcode); - void ReadByteMask(uint8& b) - { - b = ReadBit() ? 1 : 0; - } - - void ReadByteSeq(uint8& b) - { - if (b != 0) - b ^= read(); - } - - void WriteByteMask(uint8 b) - { - WriteBit(b); - } - - void WriteByteSeq(uint8 b) - { - if (b != 0) - append(b ^ 1); - } - protected: Opcodes m_opcode; void Compress(void* dst, uint32 *dst_size, const void* src, int src_size); diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h index d1e6289d23..805a031ee4 100755 --- a/src/server/shared/Packets/ByteBuffer.h +++ b/src/server/shared/Packets/ByteBuffer.h @@ -183,6 +183,28 @@ class ByteBuffer return b; } + void ReadByteMask(uint8& b) + { + b = ReadBit() ? 1 : 0; + } + + void ReadByteSeq(uint8& b) + { + if (b != 0) + b ^= read(); + } + + void WriteByteMask(uint8 b) + { + WriteBit(b); + } + + void WriteByteSeq(uint8 b) + { + if (b != 0) + append(b ^ 1); + } + template void put(size_t pos, T value) { EndianConvert(value);