aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRat <gmstreetrat@gmail.com>2012-01-19 12:59:28 +0100
committerRat <gmstreetrat@gmail.com>2012-01-19 12:59:28 +0100
commite5bdc6612d2b7c289ae27829ed7b78254e0a61e3 (patch)
tree266beb86926e285a9883f4d6c6e158407d1acf93 /src
parent99086ac8a840515281447b4ddd1cd9ce14fee9a3 (diff)
Core/Packets: Moved Bit related functions to ByteBuffer from WorldPacket
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Server/WorldPacket.h22
-rwxr-xr-xsrc/server/shared/Packets/ByteBuffer.h22
2 files changed, 22 insertions, 22 deletions
diff --git a/src/server/game/Server/WorldPacket.h b/src/server/game/Server/WorldPacket.h
index a005a1b57fa..f648e905bf9 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<uint8>();
- }
-
- void WriteByteMask(uint8 b)
- {
- WriteBit(b);
- }
-
- void WriteByteSeq(uint8 b)
- {
- if (b != 0)
- append<uint8>(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 d1e6289d23f..805a031ee4b 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<uint8>();
+ }
+
+ void WriteByteMask(uint8 b)
+ {
+ WriteBit(b);
+ }
+
+ void WriteByteSeq(uint8 b)
+ {
+ if (b != 0)
+ append<uint8>(b ^ 1);
+ }
+
template <typename T> void put(size_t pos, T value)
{
EndianConvert(value);