diff options
| author | ForesterDev <11771800+ForesterDev@users.noreply.github.com> | 2020-09-18 21:21:12 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-18 19:21:12 +0200 |
| commit | 2a91743d6ce2a2d6d184c903bd431e757f625c25 (patch) | |
| tree | ba58f2df0a54979f8e9631db695d73acad0690f5 /src/server/game/Server | |
| parent | 3ce1a5b3ac84fd039052dd2352e8ac001af2c1a7 (diff) | |
Core/PacketIO: Updated SMSG_CHAT_SERVER_MESSAGE (#25468)
* Core/PacketIO: Updated enabled SMSG_CHAT_SERVER_MESSAGE
(cherry picked from commit fc7014628af364911de75eebcac2034676292b30)
Co-authored-by: Vincent-Michael <Vincent_Michael@gmx.de>
Diffstat (limited to 'src/server/game/Server')
| -rw-r--r-- | src/server/game/Server/Packets/ChatPackets.cpp | 8 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/ChatPackets.h | 11 | ||||
| -rw-r--r-- | src/server/game/Server/Protocol/Opcodes.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Server/Protocol/Opcodes.h | 2 |
4 files changed, 21 insertions, 2 deletions
diff --git a/src/server/game/Server/Packets/ChatPackets.cpp b/src/server/game/Server/Packets/ChatPackets.cpp index 966f10e6078..4a4a90902bd 100644 --- a/src/server/game/Server/Packets/ChatPackets.cpp +++ b/src/server/game/Server/Packets/ChatPackets.cpp @@ -29,3 +29,11 @@ void WorldPackets::Chat::EmoteClient::Read() { _worldPacket >> EmoteID; } + +WorldPacket const* WorldPackets::Chat::ChatServerMessage::Write() +{ + _worldPacket << int32(MessageID); + _worldPacket << StringParam; + + return &_worldPacket; +} diff --git a/src/server/game/Server/Packets/ChatPackets.h b/src/server/game/Server/Packets/ChatPackets.h index b299b3b3e4e..f14c6bab8c2 100644 --- a/src/server/game/Server/Packets/ChatPackets.h +++ b/src/server/game/Server/Packets/ChatPackets.h @@ -45,6 +45,17 @@ namespace WorldPackets uint32 EmoteID = 0; }; + + class ChatServerMessage final : public ServerPacket + { + public: + ChatServerMessage() : ServerPacket(SMSG_CHAT_SERVER_MESSAGE, 4 + 20) { } + + WorldPacket const* Write() override; + + int32 MessageID = 0; + std::string StringParam; + }; } } diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index 33d7e334de1..a8d84a8d0ea 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -785,7 +785,7 @@ void OpcodeTable::Initialize() /*0x28E*/ DEFINE_HANDLER(CMSG_GROUP_RAID_CONVERT, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGroupRaidConvertOpcode ); /*0x28F*/ DEFINE_HANDLER(CMSG_GROUP_ASSISTANT_LEADER, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGroupAssistantLeaderOpcode); /*0x290*/ DEFINE_HANDLER(CMSG_BUYBACK_ITEM, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleBuybackItem ); - /*0x291*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_SERVER_MESSAGE, STATUS_NEVER); + /*0x291*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_CHAT_SERVER_MESSAGE, STATUS_NEVER); /*0x292*/ DEFINE_HANDLER(CMSG_SET_SAVED_INSTANCE_EXTEND, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSetSavedInstanceExtend ); /*0x293*/ DEFINE_SERVER_OPCODE_HANDLER(SMSG_LFG_OFFER_CONTINUE, STATUS_NEVER); /*0x294*/ DEFINE_HANDLER(CMSG_TEST_DROP_RATE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL ); diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index 61f6c89ea9d..38cc24128c1 100644 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -683,7 +683,7 @@ enum Opcodes : uint16 CMSG_GROUP_RAID_CONVERT = 0x28E, CMSG_GROUP_ASSISTANT_LEADER = 0x28F, CMSG_BUYBACK_ITEM = 0x290, - SMSG_SERVER_MESSAGE = 0x291, + SMSG_CHAT_SERVER_MESSAGE = 0x291, CMSG_SET_SAVED_INSTANCE_EXTEND = 0x292, SMSG_LFG_OFFER_CONTINUE = 0x293, CMSG_TEST_DROP_RATE = 0x294, |