From d3c5065293cadcb2dc2a6f9f444a04aabae1d43c Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 10 Aug 2012 18:48:34 +0200 Subject: Core/PacketIO: Cleaned up manual shifting for account name length reads in CMSG_AUTH_SESSION --- src/server/game/Server/WorldSocket.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp index 213206083bc..f73e36f3fbd 100644 --- a/src/server/game/Server/WorldSocket.cpp +++ b/src/server/game/Server/WorldSocket.cpp @@ -870,11 +870,9 @@ int WorldSocket::HandleAuthSession(WorldPacket& recvPacket) addonsData.resize(addonSize); recvPacket.read((uint8*)addonsData.contents(), addonSize); - uint8 highBitsAccountLen; - uint8 lowBitsAccountLen; - recvPacket >> highBitsAccountLen; - recvPacket >> lowBitsAccountLen; - account = recvPacket.ReadString(((highBitsAccountLen << 5) & 0xFF) | (lowBitsAccountLen >> 3)); + recvPacket.ReadBit(); + uint32 accountNameLength = recvPacket.ReadBits(12); + account = recvPacket.ReadString(accountNameLength); if (sWorld->IsClosed()) { -- cgit v1.2.3