From 665b1daab713c4fca0b553ca5939090fbdd448be Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 11 Oct 2014 23:40:51 +0200 Subject: Core/PacketIO: Removed PacketFilter::DropHighBytes --- src/server/game/Server/WorldSession.cpp | 6 ++---- src/server/game/Server/WorldSession.h | 1 - src/server/game/Server/WorldSocket.cpp | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 428e0582867..4c183939460 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -56,8 +56,7 @@ std::string const DefaultPlayerName = ""; bool MapSessionFilter::Process(WorldPacket* packet) { - Opcodes opcode = DropHighBytes(packet->GetOpcode()); - OpcodeHandler const* opHandle = opcodeTable[opcode]; + OpcodeHandler const* opHandle = opcodeTable[packet->GetOpcode()]; //let's check if our opcode can be really processed in Map::Update() if (opHandle->ProcessingPlace == PROCESS_INPLACE) @@ -79,8 +78,7 @@ bool MapSessionFilter::Process(WorldPacket* packet) //OR packet handler is not thread-safe! bool WorldSessionFilter::Process(WorldPacket* packet) { - Opcodes opcode = DropHighBytes(packet->GetOpcode()); - OpcodeHandler const* opHandle = opcodeTable[opcode]; + OpcodeHandler const* opHandle = opcodeTable[packet->GetOpcode()]; //check if packet handler is supposed to be safe if (opHandle->ProcessingPlace == PROCESS_INPLACE) return true; diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index 4ec407f5254..02a185b0b63 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -144,7 +144,6 @@ public: virtual bool Process(WorldPacket* /*packet*/) { return true; } virtual bool ProcessLogout() const { return true; } - static Opcodes DropHighBytes(Opcodes opcode) { return Opcodes(opcode & 0xFFFF); } protected: WorldSession* const m_pSession; diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp index f37354f7e65..83b67f426e0 100644 --- a/src/server/game/Server/WorldSocket.cpp +++ b/src/server/game/Server/WorldSocket.cpp @@ -162,7 +162,7 @@ bool WorldSocket::ReadDataHandler() { ClientPktHeader* header = reinterpret_cast(_headerBuffer.GetReadPointer()); - Opcodes opcode = PacketFilter::DropHighBytes(Opcodes(header->cmd)); + Opcodes opcode(header->cmd); std::string opcodeName = GetOpcodeNameForLogging(opcode); -- cgit v1.2.3