diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-10-21 20:27:00 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-10-21 20:27:00 +0200 |
| commit | 034561792ca9a07d719961ea842af2118428816f (patch) | |
| tree | a3e360f5fd1d439508dd29ee22a5983a828f8306 /src/server/game/Handlers/MiscHandler.cpp | |
| parent | 9cc7044546eaaaf4fd7a999c5e074ad0ea3d47ef (diff) | |
Core/Entities: Second batch of removing implicit conversions of ObjectGuid to uint64
Diffstat (limited to 'src/server/game/Handlers/MiscHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/MiscHandler.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index 5c515289163..4496ada7cf9 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -377,7 +377,8 @@ void WorldSession::HandleLogoutRequestOpcode(WorldPacket& /*recvData*/) { TC_LOG_DEBUG("network", "WORLD: Recvd CMSG_LOGOUT_REQUEST Message, security - %u", GetSecurity()); - if (ObjectGuid lguid = GetPlayer()->GetLootGUID()) + ObjectGuid lguid = GetPlayer()->GetLootGUID(); + if (!lguid.IsEmpty()) DoLootRelease(lguid); bool instantLogout = (GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) && !GetPlayer()->IsInCombat()) || @@ -611,7 +612,7 @@ void WorldSession::HandleAddFriendOpcodeCallBack(PreparedQueryResult result, std if (HasPermission(rbac::RBAC_PERM_ALLOW_GM_FRIEND) || AccountMgr::IsPlayerAccount(AccountMgr::GetSecurity(friendAccountId, realmHandle.Index))) { - if (friendGuid) + if (!friendGuid.IsEmpty()) { if (friendGuid == GetPlayer()->GetGUID()) friendResult = FRIEND_SELF; @@ -692,7 +693,7 @@ void WorldSession::HandleAddIgnoreOpcodeCallBack(PreparedQueryResult result) { IgnoreGuid = ObjectGuid(HIGHGUID_PLAYER, (*result)[0].GetUInt32()); - if (IgnoreGuid) + if (!IgnoreGuid.IsEmpty()) { if (IgnoreGuid == GetPlayer()->GetGUID()) //not add yourself ignoreResult = FRIEND_IGNORE_SELF; |