From bbefb4a433e10bb079b3d526f127f626e934b1f1 Mon Sep 17 00:00:00 2001 From: Shauren Date: Wed, 1 Apr 2015 18:22:49 +0200 Subject: Core/Arenas: Removed arena team related opcodes and methods that were only used by them --- src/server/game/Server/Protocol/Opcodes.cpp | 6 +++--- src/server/game/Server/Protocol/Opcodes.h | 6 ------ 2 files changed, 3 insertions(+), 9 deletions(-) (limited to 'src/server/game/Server/Protocol') diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index 8a14ea695d4..81ea2830a64 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -137,12 +137,12 @@ void OpcodeTable::ValidateAndSetServerOpcode(OpcodeServer opcode, char const* na /// Correspondence between opcodes and their names void OpcodeTable::Initialize() { -#define DEFINE_OPCODE_HANDLER_OLD(opcode, status, processing, handler) \ - ValidateAndSetClientOpcode(opcode, #opcode, status, processing); - #define DEFINE_HANDLER(opcode, status, processing, packetclass, handler) \ ValidateAndSetClientOpcode(opcode, #opcode, status, processing); +#define DEFINE_OPCODE_HANDLER_OLD(opcode, status, processing, handler) \ + DEFINE_HANDLER(opcode, status, processing, WorldPacket, handler); + DEFINE_HANDLER(CMSG_ACCEPT_GUILD_INVITE, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, WorldPackets::Guild::AcceptGuildInvite, &WorldSession::HandleGuildAcceptInvite); DEFINE_OPCODE_HANDLER_OLD(CMSG_ACCEPT_LEVEL_GRANT, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleAcceptGrantLevel ); DEFINE_OPCODE_HANDLER_OLD(CMSG_ACCEPT_TRADE, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleAcceptTradeOpcode ); diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index ccf995cf642..ec9a9264757 100644 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -1635,14 +1635,8 @@ enum OpcodeServer : uint32 SMSG_ZONE_UNDER_ATTACK = 0x14CF, // Deleted opcodes, here only to allow compile - SMSG_ARENA_TEAM_COMMAND_RESULT = 0xBADD, - SMSG_ARENA_TEAM_EVENT = 0xBADD, - SMSG_ARENA_TEAM_INVITE = 0xBADD, - SMSG_ARENA_TEAM_QUERY_RESPONSE = 0xBADD, - SMSG_ARENA_TEAM_ROSTER = 0xBADD, SMSG_ARENA_TEAM_STATS = 0xBADD, SMSG_BUY_BANK_SLOT_RESULT = 0xBADD, - SMSG_CALENDAR_ARENA_TEAM = 0xBADD, }; inline bool IsInstanceOnlyOpcode(uint32 opcode) -- cgit v1.2.3