diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-10-21 19:23:32 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-10-21 19:23:32 +0200 |
| commit | 9cc7044546eaaaf4fd7a999c5e074ad0ea3d47ef (patch) | |
| tree | e40c2f50a9b5b11620ee607103f0352521bdf54f /src/server/game/Chat/Chat.cpp | |
| parent | 1bea52fd4649b6a1761aa157f9e74f01e19872e7 (diff) | |
Core/Entities: First batch of removing implicit conversions of ObjectGuid to uint64
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 501f73c460f..ac3f9350412 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -637,7 +637,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) { @@ -652,8 +652,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; @@ -666,7 +666,7 @@ size_t ChatHandler::BuildChatPacket(WorldPacket& data, ChatMsg chatType, Languag data << uint32(senderName.length() + 1); data << senderName; receiverGUIDPos = data.wpos(); - data << uint64(receiverGUID); + data << receiverGUID; if (language == LANG_ADDON) data << addonPrefix; break; @@ -674,8 +674,8 @@ size_t ChatHandler::BuildChatPacket(WorldPacket& data, ChatMsg chatType, Languag 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; @@ -687,7 +687,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; if (language == LANG_ADDON) data << addonPrefix; break; @@ -705,7 +705,7 @@ size_t ChatHandler::BuildChatPacket(WorldPacket& data, ChatMsg chatType, Languag } receiverGUIDPos = data.wpos(); - data << uint64(receiverGUID); + data << receiverGUID; if (language == LANG_ADDON) data << addonPrefix; @@ -1162,7 +1162,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 { |