From ee682544d027c1e33dcade592422a2d5b5e57ddb Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 1 Oct 2018 21:01:10 +0200 Subject: Core/PacketIO: Updated opcode enum to 8.0 --- src/server/game/Handlers/ChatHandler.cpp | 35 +++----------------------------- 1 file changed, 3 insertions(+), 32 deletions(-) (limited to 'src/server/game/Handlers/ChatHandler.cpp') diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp index bf724ae21ff..cfafcb5427b 100644 --- a/src/server/game/Handlers/ChatHandler.cpp +++ b/src/server/game/Handlers/ChatHandler.cpp @@ -413,41 +413,12 @@ void WorldSession::HandleChatMessage(ChatMsg type, uint32 lang, std::string msg, void WorldSession::HandleChatAddonMessageOpcode(WorldPackets::Chat::ChatAddonMessage& chatAddonMessage) { - ChatMsg type; - - switch (chatAddonMessage.GetOpcode()) - { - case CMSG_CHAT_ADDON_MESSAGE_GUILD: - type = CHAT_MSG_GUILD; - break; - case CMSG_CHAT_ADDON_MESSAGE_OFFICER: - type = CHAT_MSG_OFFICER; - break; - case CMSG_CHAT_ADDON_MESSAGE_PARTY: - type = CHAT_MSG_PARTY; - break; - case CMSG_CHAT_ADDON_MESSAGE_RAID: - type = CHAT_MSG_RAID; - break; - case CMSG_CHAT_ADDON_MESSAGE_INSTANCE_CHAT: - type = CHAT_MSG_INSTANCE_CHAT; - break; - default: - TC_LOG_ERROR("network", "HandleChatAddonMessageOpcode: Unknown addon chat opcode (%u)", chatAddonMessage.GetOpcode()); - return; - } - - HandleChatAddonMessage(type, chatAddonMessage.Prefix, chatAddonMessage.Text); -} - -void WorldSession::HandleChatAddonMessageWhisperOpcode(WorldPackets::Chat::ChatAddonMessageWhisper& chatAddonMessageWhisper) -{ - HandleChatAddonMessage(CHAT_MSG_WHISPER, chatAddonMessageWhisper.Prefix, chatAddonMessageWhisper.Text, chatAddonMessageWhisper.Target); + HandleChatAddonMessage(chatAddonMessage.Params.Type, chatAddonMessage.Params.Prefix, chatAddonMessage.Params.Text); } -void WorldSession::HandleChatAddonMessageChannelOpcode(WorldPackets::Chat::ChatAddonMessageChannel& chatAddonMessageChannel) +void WorldSession::HandleChatAddonMessageTargetedOpcode(WorldPackets::Chat::ChatAddonMessageTargeted& chatAddonMessageTargeted) { - HandleChatAddonMessage(CHAT_MSG_CHANNEL, chatAddonMessageChannel.Prefix, chatAddonMessageChannel.Text, chatAddonMessageChannel.Target); + HandleChatAddonMessage(chatAddonMessageTargeted.Params.Type, chatAddonMessageTargeted.Params.Prefix, chatAddonMessageTargeted.Params.Text, chatAddonMessageTargeted.Target); } void WorldSession::HandleChatAddonMessage(ChatMsg type, std::string prefix, std::string text, std::string target /*= ""*/) -- cgit v1.2.3