From 7eab6a791ae1c039de67a80ff8bd125bf69f7ba4 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 21 Oct 2014 21:09:15 +0200 Subject: Core/Entities: Final batch of removing implicit conversions of ObjectGuid to uint64 (cherry picked from commit 68f45e87345ff85341f835f0372f2a62b89f24d9) --- src/server/game/Handlers/TradeHandler.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/game/Handlers/TradeHandler.cpp') diff --git a/src/server/game/Handlers/TradeHandler.cpp b/src/server/game/Handlers/TradeHandler.cpp index 9b02adb6c86..b68e2f5f877 100644 --- a/src/server/game/Handlers/TradeHandler.cpp +++ b/src/server/game/Handlers/TradeHandler.cpp @@ -39,7 +39,7 @@ void WorldSession::SendTradeStatus(TradeStatusInfo const& info) switch (info.Status) { case TRADE_STATUS_BEGIN_TRADE: - data << uint64(info.TraderGuid); // CGTradeInfo::m_tradingPlayer + data << info.TraderGuid; // CGTradeInfo::m_tradingPlayer break; case TRADE_STATUS_OPEN_WINDOW: data << uint32(0); // CGTradeInfo::m_tradeID @@ -93,13 +93,13 @@ void WorldSession::SendUpdateTrade(bool trader_data /*= true*/) data << uint32(item->GetCount()); // stack count // wrapped: hide stats but show giftcreator name data << uint32(item->IsWrapped() ? 1 : 0); - data << uint64(item->GetGuidValue(ITEM_FIELD_GIFTCREATOR)); + data << item->GetGuidValue(ITEM_FIELD_GIFTCREATOR); // perm. enchantment and gems data << uint32(item->GetEnchantmentId(PERM_ENCHANTMENT_SLOT)); for (uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+MAX_GEM_SOCKETS; ++enchant_slot) data << uint32(item->GetEnchantmentId(EnchantmentSlot(enchant_slot))); // creator - data << uint64(item->GetGuidValue(ITEM_FIELD_CREATOR)); + data << item->GetGuidValue(ITEM_FIELD_CREATOR); data << uint32(item->GetSpellCharges()); // charges data << uint32(item->GetItemSuffixFactor()); // SuffixFactor data << uint32(item->GetItemRandomPropertyId());// random properties id -- cgit v1.2.3