diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-10-21 19:23:32 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2025-09-28 21:38:32 +0200 |
| commit | d144724e2fd8a74a3e896751dc9c866b3932f815 (patch) | |
| tree | e1f3c155560705bbd0f7dea15351b14602354454 /src/server/game/Chat/Chat.cpp | |
| parent | 3059fcd70a01bccdf8ea6dd1ae7bedefd737d558 (diff) | |
Core/Entities: First batch of removing implicit conversions of ObjectGuid to uint64
(cherry picked from commit 9cc7044546eaaaf4fd7a999c5e074ad0ea3d47ef)
Diffstat (limited to 'src/server/game/Chat/Chat.cpp')
| -rw-r--r-- | src/server/game/Chat/Chat.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index 8059ebc55a2..42c74538b32 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -193,7 +193,7 @@ size_t ChatHandler::BuildChatPacket(WorldPacket& data, ChatMsg chatType, Languag data.Initialize(!gmMessage ? SMSG_MESSAGECHAT : SMSG_GM_MESSAGECHAT); data << uint8(chatType); data << int32(language); - data << uint64(senderGUID); + data << senderGUID; data << uint32(0); // some flags switch (chatType) { @@ -208,8 +208,8 @@ size_t ChatHandler::BuildChatPacket(WorldPacket& data, ChatMsg chatType, Languag data << uint32(senderName.length() + 1); data << senderName; receiverGUIDPos = data.wpos(); - data << uint64(receiverGUID); - if (receiverGUID && !receiverGUID.IsPlayer() && !receiverGUID.IsPet()) + data << receiverGUID; + if (!receiverGUID.IsEmpty() && !receiverGUID.IsPlayer() && !receiverGUID.IsPet()) { data << uint32(receiverName.length() + 1); data << receiverName; @@ -219,14 +219,14 @@ size_t ChatHandler::BuildChatPacket(WorldPacket& data, ChatMsg chatType, Languag data << uint32(senderName.length() + 1); data << senderName; receiverGUIDPos = data.wpos(); - data << uint64(receiverGUID); + data << receiverGUID; break; case CHAT_MSG_BG_SYSTEM_NEUTRAL: case CHAT_MSG_BG_SYSTEM_ALLIANCE: case CHAT_MSG_BG_SYSTEM_HORDE: receiverGUIDPos = data.wpos(); - data << uint64(receiverGUID); - if (receiverGUID && !receiverGUID.IsPlayer()) + data << receiverGUID; + if (!receiverGUID.IsEmpty() && !receiverGUID.IsPlayer()) { data << uint32(receiverName.length() + 1); data << receiverName; @@ -235,7 +235,7 @@ size_t ChatHandler::BuildChatPacket(WorldPacket& data, ChatMsg chatType, Languag case CHAT_MSG_ACHIEVEMENT: case CHAT_MSG_GUILD_ACHIEVEMENT: receiverGUIDPos = data.wpos(); - data << uint64(receiverGUID); + data << receiverGUID; break; default: if (gmMessage) @@ -251,7 +251,7 @@ size_t ChatHandler::BuildChatPacket(WorldPacket& data, ChatMsg chatType, Languag } receiverGUIDPos = data.wpos(); - data << uint64(receiverGUID); + data << receiverGUID; break; } @@ -607,7 +607,7 @@ bool ChatHandler::extractPlayerTarget(char* args, Player** player, ObjectGuid* p *player_guid = pl ? pl->GetGUID() : guid; if (player_name) - *player_name = pl || guid ? name : ""; + *player_name = pl || !guid.IsEmpty() ? name : ""; } else { |