diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 795a78ad8a..a72db50bb1 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -9995,7 +9995,7 @@ bool Player::HasGemWithLimitCategoryEquipped(uint32 limitCategory, uint32 count, return false; } -InventoryResult Player::CanTakeMoreSimilarItems(uint32 entry, uint32 count, Item* pItem, uint32* no_space_count /*= nullptr*/, uint32* itemLimitCategory /*= nullptr*/) const +InventoryResult Player::CanTakeMoreSimilarItems(uint32 entry, uint32 count, Item* pItem, uint32* no_space_count /*= nullptr*/, uint32* offendingItemId /*= nullptr*/) const { ItemTemplate const* pProto = sObjectMgr->GetItemTemplate(entry); if (!pProto) @@ -10041,8 +10041,8 @@ InventoryResult Player::CanTakeMoreSimilarItems(uint32 entry, uint32 count, Item { if (no_space_count) *no_space_count = count + curcount - limitEntry->Quantity; - if (itemLimitCategory) - *itemLimitCategory = pProto->GetItemLimitCategory(); + if (offendingItemId) + *offendingItemId = pProto->GetId(); return EQUIP_ERR_ITEM_MAX_LIMIT_CATEGORY_COUNT_EXCEEDED_IS; } } @@ -10581,7 +10581,7 @@ InventoryResult Player::CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec &des } ////////////////////////////////////////////////////////////////////////// -InventoryResult Player::CanStoreItems(Item** items, int count, uint32* itemLimitCategory) const +InventoryResult Player::CanStoreItems(Item** items, int count, uint32* offendingItemId) const { Item* item2; @@ -10636,7 +10636,7 @@ InventoryResult Player::CanStoreItems(Item** items, int count, uint32* itemLimit ItemTemplate const* pBagProto; // item is 'one item only' - InventoryResult res = CanTakeMoreSimilarItems(item, itemLimitCategory); + InventoryResult res = CanTakeMoreSimilarItems(item, offendingItemId); if (res != EQUIP_ERR_OK) return res; diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index a92d70ab9b..3d8f9a0e8c 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -926,19 +926,6 @@ struct BGData bool HasTaxiPath() const { return taxiPath[0] && taxiPath[1]; } }; -struct TradeStatusInfo -{ - TradeStatusInfo() : Status(TRADE_STATUS_BUSY), TraderGuid(), Result(EQUIP_ERR_OK), - IsTargetResult(false), ItemLimitCategoryId(0), Slot(0) { } - - TradeStatus Status; - ObjectGuid TraderGuid; - InventoryResult Result; - bool IsTargetResult; - uint32 ItemLimitCategoryId; - uint8 Slot; -}; - struct VoidStorageItem { VoidStorageItem() : ItemId(0), ItemEntry(0), ItemRandomPropertyId(), ItemSuffixFactor(0) { } @@ -1185,11 +1172,11 @@ class TC_GAME_API Player : public Unit, public GridObject bool HasItemOrGemWithIdEquipped(uint32 item, uint32 count, uint8 except_slot = NULL_SLOT) const; bool HasItemWithLimitCategoryEquipped(uint32 limitCategory, uint32 count, uint8 except_slot = NULL_SLOT) const; bool HasGemWithLimitCategoryEquipped(uint32 limitCategory, uint32 count, uint8 except_slot = NULL_SLOT) const; - InventoryResult CanTakeMoreSimilarItems(Item* pItem, uint32* itemLimitCategory = nullptr) const; - InventoryResult CanTakeMoreSimilarItems(uint32 entry, uint32 count, uint32* itemLimitCategory = nullptr) const { return CanTakeMoreSimilarItems(entry, count, nullptr, nullptr, itemLimitCategory); } + InventoryResult CanTakeMoreSimilarItems(Item* pItem, uint32* offendingItemId = nullptr) const; + InventoryResult CanTakeMoreSimilarItems(uint32 entry, uint32 count, uint32* offendingItemId = nullptr) const { return CanTakeMoreSimilarItems(entry, count, nullptr, nullptr, offendingItemId); } InventoryResult CanStoreNewItem(uint8 bag, uint8 slot, ItemPosCountVec& dest, uint32 item, uint32 count, uint32* no_space_count = nullptr) const; InventoryResult CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec& dest, Item* pItem, bool swap = false) const; - InventoryResult CanStoreItems(Item** items, int count, uint32* itemLimitCategory) const; + InventoryResult CanStoreItems(Item** items, int count, uint32* offendingItemId) const; InventoryResult CanEquipNewItem(uint8 slot, uint16& dest, uint32 item, bool swap) const; InventoryResult CanEquipItem(uint8 slot, uint16& dest, Item* pItem, bool swap, bool not_loading = true) const; @@ -1213,7 +1200,7 @@ class TC_GAME_API Player : public Unit, public GridObject void AutoStoreLoot(uint32 loot_id, LootStore const& store, bool broadcast = false) { AutoStoreLoot(NULL_BAG, NULL_SLOT, loot_id, store, broadcast); } void StoreLootItem(uint8 lootSlot, Loot* loot, GameObject* go = nullptr); - InventoryResult CanTakeMoreSimilarItems(uint32 entry, uint32 count, Item* pItem, uint32* no_space_count = nullptr, uint32* itemLimitCategory = nullptr) const; + InventoryResult CanTakeMoreSimilarItems(uint32 entry, uint32 count, Item* pItem, uint32* no_space_count = nullptr, uint32* offendingItemId = nullptr) const; InventoryResult CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec& dest, uint32 entry, uint32 count, Item* pItem = nullptr, bool swap = false, uint32* no_space_count = nullptr) const; void AddRefundReference(ObjectGuid it); diff --git a/src/server/game/Entities/Player/TradeData.cpp b/src/server/game/Entities/Player/TradeData.cpp index 6cfc67e110..3d20e81fea 100644 --- a/src/server/game/Entities/Player/TradeData.cpp +++ b/src/server/game/Entities/Player/TradeData.cpp @@ -18,6 +18,7 @@ #include "TradeData.h" #include "Item.h" #include "Player.h" +#include "TradePackets.h" #include "WorldSession.h" TradeData* TradeData::GetTraderData() const @@ -67,6 +68,8 @@ void TradeData::SetItem(TradeSlots slot, Item* item, bool update /*= false*/) SetAccepted(false); GetTraderData()->SetAccepted(false); + UpdateServerStateIndex(); + Update(); // need remove possible trader spell applied to changed item @@ -90,6 +93,8 @@ void TradeData::SetSpell(uint32 spell_id, Item* castItem /*= nullptr*/) SetAccepted(false); GetTraderData()->SetAccepted(false); + UpdateServerStateIndex(); + Update(true); // send spell info to item owner Update(false); // send spell info to caster self } @@ -101,9 +106,9 @@ void TradeData::SetMoney(uint64 money) if (!_player->HasEnoughMoney(money)) { - TradeStatusInfo info; - info.Status = TRADE_STATUS_CLOSE_WINDOW; - info.Result = EQUIP_ERR_NOT_ENOUGH_MONEY; + WorldPackets::Trade::TradeStatus info; + info.Status = TRADE_STATUS_FAILED; + info.BagResult = EQUIP_ERR_NOT_ENOUGH_MONEY; _player->GetSession()->SendTradeStatus(info); return; } @@ -113,6 +118,8 @@ void TradeData::SetMoney(uint64 money) SetAccepted(false); GetTraderData()->SetAccepted(false); + UpdateServerStateIndex(); + Update(true); } @@ -130,8 +137,9 @@ void TradeData::SetAccepted(bool state, bool forTrader /*= false*/) if (!state) { - TradeStatusInfo info; - info.Status = TRADE_STATUS_BACK_TO_TRADE; + WorldPackets::Trade::TradeStatus info; + + info.Status = TRADE_STATUS_UNACCEPTED; if (forTrader) _trader->GetSession()->SendTradeStatus(info); else diff --git a/src/server/game/Entities/Player/TradeData.h b/src/server/game/Entities/Player/TradeData.h index 0e8880390c..be9682e474 100644 --- a/src/server/game/Entities/Player/TradeData.h +++ b/src/server/game/Entities/Player/TradeData.h @@ -36,7 +36,7 @@ class TC_GAME_API TradeData public: TradeData(Player* player, Player* trader) : _player(player), _trader(trader), _accepted(false), _acceptProccess(false), - _money(0), _spell(0), _spellCastItem() { } + _money(0), _spell(0), _spellCastItem(), m_clientStateIndex(1), m_serverStateIndex(1) { } Player* GetTrader() const { return _trader; } TradeData* GetTraderData() const; @@ -61,6 +61,12 @@ public: bool IsInAcceptProcess() const { return _acceptProccess; } void SetInAcceptProcess(bool state) { _acceptProccess = state; } + uint32 GetClientStateIndex() const { return m_clientStateIndex; } + void UpdateClientStateIndex() { ++m_clientStateIndex; } + + uint32 GetServerStateIndex() const { return m_serverStateIndex; } + void UpdateServerStateIndex() { m_serverStateIndex = rand32(); } + private: void Update(bool for_trader = true) const; @@ -76,6 +82,9 @@ private: ObjectGuid _spellCastItem; // applied spell cast by item use ObjectGuid _items[TRADE_SLOT_COUNT]; // traded items from _player side including non-traded slot + + uint32 m_clientStateIndex; + uint32 m_serverStateIndex; }; #endif // TradeData_h__ diff --git a/src/server/game/Handlers/TradeHandler.cpp b/src/server/game/Handlers/TradeHandler.cpp index a72fa374e5..6d0b69fb62 100644 --- a/src/server/game/Handlers/TradeHandler.cpp +++ b/src/server/game/Handlers/TradeHandler.cpp @@ -20,6 +20,7 @@ #include "Common.h" #include "DatabaseEnv.h" #include "Item.h" +#include "ItemPacketsCommon.h" #include "Language.h" #include "Log.h" #include "ObjectAccessor.h" @@ -28,62 +29,16 @@ #include "Spell.h" #include "SpellMgr.h" #include "TradeData.h" +#include "TradePackets.h" #include "World.h" #include "WorldPacket.h" -void WorldSession::SendTradeStatus(TradeStatusInfo const& info) +void WorldSession::SendTradeStatus(WorldPackets::Trade::TradeStatus& info) { - Player* trader = GetPlayer()->GetTrader(); - - WorldPacket data(SMSG_TRADE_STATUS, 13); - data.WriteBit(trader ? (trader->GetSession()->GetBattlenetAccountId() == GetBattlenetAccountId()) : 0); // IsSameBnetAccount, used for trading heirlooms and other battle.net bound items with your other accounts - data.WriteBits(info.Status, 5); - - switch (info.Status) - { - case TRADE_STATUS_BEGIN_TRADE: - data.WriteBit(info.TraderGuid[2]); - data.WriteBit(info.TraderGuid[4]); - data.WriteBit(info.TraderGuid[6]); - data.WriteBit(info.TraderGuid[0]); - data.WriteBit(info.TraderGuid[1]); - data.WriteBit(info.TraderGuid[3]); - data.WriteBit(info.TraderGuid[7]); - data.WriteBit(info.TraderGuid[5]); - - data.WriteByteSeq(info.TraderGuid[4]); - data.WriteByteSeq(info.TraderGuid[1]); - data.WriteByteSeq(info.TraderGuid[2]); - data.WriteByteSeq(info.TraderGuid[3]); - data.WriteByteSeq(info.TraderGuid[0]); - data.WriteByteSeq(info.TraderGuid[7]); - data.WriteByteSeq(info.TraderGuid[6]); - data.WriteByteSeq(info.TraderGuid[5]); - break; - case TRADE_STATUS_OPEN_WINDOW: - data << uint32(0); // CGTradeInfo::m_tradeID - break; - case TRADE_STATUS_CLOSE_WINDOW: - data.WriteBit(info.IsTargetResult); // bool isTargetError; used for: EQUIP_ERR_BAG_FULL, EQUIP_ERR_CANT_CARRY_MORE_OF_THIS, EQUIP_ERR_MISSING_REAGENT, EQUIP_ERR_ITEM_MAX_LIMIT_CATEGORY_COUNT_EXCEEDED - data << uint32(info.Result); // InventoryResult - data << uint32(info.ItemLimitCategoryId); // ItemLimitCategory.dbc entry - break; - case TRADE_STATUS_WRONG_REALM: - case TRADE_STATUS_NOT_ON_TAPLIST: - data << uint8(info.Slot); // Trade slot; -1 here clears CGTradeInfo::m_tradeMoney - break; - case TRADE_STATUS_CURRENCY: // Not implemented - case TRADE_STATUS_CURRENCY_NOT_TRADABLE: // Not implemented - // Blizzard never implemented these, you can only trade currency with the field9 & 1 in CurrencyTypes.DBC, and only two test currencies have that flag - data << uint32(0); // Trading Currency Id - data << uint32(0); // Trading Currency Amount - break; - default: - data.FlushBits(); - break; - } - - SendPacket(&data); + info.Clear(); // reuse packet + Player* trader = _player->GetTrader(); + info.PartnerIsSameBnetAccount = trader && trader->GetSession()->GetBattlenetAccountId() == GetBattlenetAccountId(); + SendPacket(info.Write()); } void WorldSession::HandleIgnoreTradeOpcode(WorldPacket& /*recvPacket*/) @@ -100,107 +55,42 @@ void WorldSession::SendUpdateTrade(bool trader_data /*= true*/) { TradeData* view_trade = trader_data ? _player->GetTradeData()->GetTraderData() : _player->GetTradeData(); - ByteBuffer itemData(7*2 + 7*4 + 3*4 + 3*4 + 1); - - uint8 count = 0; - for (uint8 i = 0; i < TRADE_SLOT_COUNT; ++i) - if (view_trade->GetItem(TradeSlots(i))) - ++count; - - WorldPacket data(SMSG_TRADE_STATUS_EXTENDED, 4*6 + 8 + 1 + 3 + count * 70); - data << uint32(0); // CGTradeInfo::m_tradeID - data << uint32(0); // unk 2 - data << uint64(view_trade->GetMoney()); // trader gold - data << uint32(view_trade->GetSpell()); // spell casted on lowest slot item - data << uint32(TRADE_SLOT_COUNT); // trade slots count/number?, = next field in most cases - data << uint32(0); // unk 5 - data << uint8(trader_data); // 1 means traders data, 0 means own - data << uint32(TRADE_SLOT_COUNT); // trade slots count/number?, = prev field in most cases - data.WriteBits(count, 22); + WorldPackets::Trade::TradeUpdated tradeUpdated; + tradeUpdated.WhichPlayer = trader_data; + tradeUpdated.ClientStateIndex = view_trade->GetClientStateIndex(); + tradeUpdated.CurrentStateIndex = view_trade->GetServerStateIndex(); + tradeUpdated.Gold = view_trade->GetMoney(); + tradeUpdated.ProposedEnchantment = view_trade->GetSpell(); for (uint8 i = 0; i < TRADE_SLOT_COUNT; ++i) { - Item* item = view_trade->GetItem(TradeSlots(i)); - if (!item) - continue; - - ObjectGuid giftCreatorGuid = item->GetGuidValue(ITEM_FIELD_GIFTCREATOR); - ObjectGuid creatorGuid = item->GetGuidValue(ITEM_FIELD_CREATOR); - - data.WriteBit(giftCreatorGuid[7]); - data.WriteBit(giftCreatorGuid[1]); - bool notWrapped = data.WriteBit(!item->HasFlag(ITEM_FIELD_FLAGS, ITEM_FIELD_FLAG_WRAPPED)); - data.WriteBit(giftCreatorGuid[3]); - - if (notWrapped) + if (Item const* item = view_trade->GetItem(TradeSlots(i))) { - data.WriteBit(creatorGuid[7]); - data.WriteBit(creatorGuid[1]); - data.WriteBit(creatorGuid[4]); - data.WriteBit(creatorGuid[6]); - data.WriteBit(creatorGuid[2]); - data.WriteBit(creatorGuid[3]); - data.WriteBit(creatorGuid[5]); - data.WriteBit(item->GetTemplate()->GetLockID() != 0); - data.WriteBit(creatorGuid[0]); + WorldPackets::Trade::TradeItem tradeItem; + tradeItem.Slot = i; + tradeItem.EntryID = item->GetEntry(); + tradeItem.StackCount = item->GetCount(); + tradeItem.GiftCreator = item->GetGuidValue(ITEM_FIELD_GIFTCREATOR); + if (!item->HasFlag(ITEM_FIELD_FLAGS, ITEM_FIELD_FLAG_WRAPPED)) + { + WorldPackets::Trade::UnwrappedTradeItem& unwrappedItem = tradeItem.Unwrapped.emplace(); + unwrappedItem.Item.Initialize(item); + unwrappedItem.EnchantID = item->GetEnchantmentId(PERM_ENCHANTMENT_SLOT); + unwrappedItem.ReforgeEnchantmentID = item->GetEnchantmentId(REFORGE_ENCHANTMENT_SLOT); + unwrappedItem.Creator = item->GetGuidValue(ITEM_FIELD_CREATOR); + unwrappedItem.Charges = item->GetSpellCharges(); + unwrappedItem.Lock = item->GetTemplate()->GetLockID() && !item->HasFlag(ITEM_FIELD_FLAGS, ITEM_FIELD_FLAG_UNLOCKED); + unwrappedItem.MaxDurability = item->GetUInt32Value(ITEM_FIELD_MAXDURABILITY); + unwrappedItem.Durability = item->GetUInt32Value(ITEM_FIELD_DURABILITY); + for (uint32 s = SOCK_ENCHANTMENT_SLOT; s < MAX_GEM_SOCKETS; ++s) + unwrappedItem.SocketEnchant[s] = item->GetEnchantmentId(EnchantmentSlot(s + SOCK_ENCHANTMENT_SLOT)); + } - itemData.WriteByteSeq(creatorGuid[1]); - - itemData << uint32(item->GetEnchantmentId(PERM_ENCHANTMENT_SLOT)); - for (uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+MAX_GEM_SOCKETS /*3*/; ++enchant_slot) - itemData << uint32(item->GetEnchantmentId(EnchantmentSlot(enchant_slot))); - itemData << uint32(item->GetUInt32Value(ITEM_FIELD_MAXDURABILITY)); - - itemData.WriteByteSeq(creatorGuid[6]); - itemData.WriteByteSeq(creatorGuid[2]); - itemData.WriteByteSeq(creatorGuid[7]); - itemData.WriteByteSeq(creatorGuid[4]); - - itemData << uint32(item->GetEnchantmentId(REFORGE_ENCHANTMENT_SLOT)); - itemData << uint32(item->GetUInt32Value(ITEM_FIELD_DURABILITY)); - itemData << uint32(item->GetItemRandomPropertyId()); - - itemData.WriteByteSeq(creatorGuid[3]); - - itemData << uint32(0); // unk7 - - itemData.WriteByteSeq(creatorGuid[0]); - - itemData << uint32(item->GetSpellCharges()); - itemData << uint32(item->GetItemSuffixFactor()); - - itemData.WriteByteSeq(creatorGuid[5]); + tradeUpdated.Items.push_back(tradeItem); } - - data.WriteBit(giftCreatorGuid[6]); - data.WriteBit(giftCreatorGuid[4]); - data.WriteBit(giftCreatorGuid[2]); - data.WriteBit(giftCreatorGuid[0]); - data.WriteBit(giftCreatorGuid[5]); - - itemData.WriteByteSeq(giftCreatorGuid[6]); - itemData.WriteByteSeq(giftCreatorGuid[1]); - itemData.WriteByteSeq(giftCreatorGuid[7]); - itemData.WriteByteSeq(giftCreatorGuid[4]); - - itemData << uint32(item->GetTemplate()->GetId()); - - itemData.WriteByteSeq(giftCreatorGuid[0]); - - itemData << uint32(item->GetCount()); - - itemData.WriteByteSeq(giftCreatorGuid[5]); - - itemData << uint8(i); - - itemData.WriteByteSeq(giftCreatorGuid[2]); - itemData.WriteByteSeq(giftCreatorGuid[3]); } - data.FlushBits(); - data.append(itemData); - - SendPacket(&data); + SendPacket(tradeUpdated.Write()); } //============================================================== @@ -332,7 +222,7 @@ static void clearAcceptTradeMode(Item* *myItems, Item* *hisItems) } } -void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/) +void WorldSession::HandleAcceptTradeOpcode(WorldPackets::Trade::AcceptTrade& acceptTrade) { TradeData* my_trade = _player->m_trade; if (!my_trade) @@ -350,7 +240,15 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/) // set before checks for propertly undo at problems (it already set in to client) my_trade->SetAccepted(true); - TradeStatusInfo info; + WorldPackets::Trade::TradeStatus info; + if (his_trade->GetServerStateIndex() != acceptTrade.StateIndex) + { + info.Status = TRADE_STATUS_STATE_CHANGED; + SendTradeStatus(info); + my_trade->SetAccepted(false); + return; + } + if (!_player->IsWithinDistInMap(trader, TRADE_DISTANCE, false)) { info.Status = TRADE_STATUS_TARGET_TO_FAR; @@ -362,8 +260,8 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/) // not accept case incorrect money amount if (!_player->HasEnoughMoney(my_trade->GetMoney())) { - info.Status = TRADE_STATUS_CLOSE_WINDOW; - info.Result = EQUIP_ERR_NOT_ENOUGH_MONEY; + info.Status = TRADE_STATUS_FAILED; + info.BagResult = EQUIP_ERR_NOT_ENOUGH_MONEY; SendTradeStatus(info); my_trade->SetAccepted(false, true); return; @@ -372,8 +270,8 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/) // not accept case incorrect money amount if (!trader->HasEnoughMoney(his_trade->GetMoney())) { - info.Status = TRADE_STATUS_CLOSE_WINDOW; - info.Result = EQUIP_ERR_NOT_ENOUGH_MONEY; + info.Status = TRADE_STATUS_FAILED; + info.BagResult = EQUIP_ERR_NOT_ENOUGH_MONEY; trader->GetSession()->SendTradeStatus(info); his_trade->SetAccepted(false, true); return; @@ -381,8 +279,8 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/) if (_player->GetMoney() > uint64(MAX_MONEY_AMOUNT) - his_trade->GetMoney()) { - info.Status = TRADE_STATUS_CLOSE_WINDOW; - info.Result = EQUIP_ERR_TOO_MUCH_GOLD; + info.Status = TRADE_STATUS_FAILED; + info.BagResult = EQUIP_ERR_TOO_MUCH_GOLD; SendTradeStatus(info); my_trade->SetAccepted(false, true); return; @@ -390,8 +288,8 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/) if (trader->GetMoney() > uint64(MAX_MONEY_AMOUNT) - my_trade->GetMoney()) { - info.Status = TRADE_STATUS_CLOSE_WINDOW; - info.Result = EQUIP_ERR_TOO_MUCH_GOLD; + info.Status = TRADE_STATUS_FAILED; + info.BagResult = EQUIP_ERR_TOO_MUCH_GOLD; trader->GetSession()->SendTradeStatus(info); his_trade->SetAccepted(false, true); return; @@ -411,8 +309,8 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/) if (item->IsBindedNotWith(trader)) { - info.Status = TRADE_STATUS_CLOSE_WINDOW; - info.Result = EQUIP_ERR_TRADE_BOUND_ITEM; + info.Status = TRADE_STATUS_FAILED; + info.BagResult = EQUIP_ERR_TRADE_BOUND_ITEM; SendTradeStatus(info); return; } @@ -522,20 +420,20 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/) trader->GetSession()->SendTradeStatus(info); // test if item will fit in each inventory - TradeStatusInfo myCanCompleteInfo, hisCanCompleteInfo; - hisCanCompleteInfo.Result = trader->CanStoreItems(myItems, TRADE_SLOT_TRADED_COUNT, &hisCanCompleteInfo.ItemLimitCategoryId); - myCanCompleteInfo.Result = _player->CanStoreItems(hisItems, TRADE_SLOT_TRADED_COUNT, &myCanCompleteInfo.ItemLimitCategoryId); + WorldPackets::Trade::TradeStatus myCanCompleteInfo, hisCanCompleteInfo; + hisCanCompleteInfo.BagResult = trader->CanStoreItems(myItems, TRADE_SLOT_TRADED_COUNT, &hisCanCompleteInfo.ItemID); + myCanCompleteInfo.BagResult = _player->CanStoreItems(hisItems, TRADE_SLOT_TRADED_COUNT, &myCanCompleteInfo.ItemID); clearAcceptTradeMode(myItems, hisItems); // in case of missing space report error - if (myCanCompleteInfo.Result != EQUIP_ERR_OK) + if (myCanCompleteInfo.BagResult != EQUIP_ERR_OK) { clearAcceptTradeMode(my_trade, his_trade); - myCanCompleteInfo.Status = TRADE_STATUS_CLOSE_WINDOW; + myCanCompleteInfo.Status = TRADE_STATUS_FAILED; trader->GetSession()->SendTradeStatus(myCanCompleteInfo); - myCanCompleteInfo.IsTargetResult = true; + myCanCompleteInfo.FailureForYou = true; SendTradeStatus(myCanCompleteInfo); my_trade->SetAccepted(false); his_trade->SetAccepted(false); @@ -543,13 +441,13 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/) delete his_spell; return; } - else if (hisCanCompleteInfo.Result != EQUIP_ERR_OK) + else if (hisCanCompleteInfo.BagResult != EQUIP_ERR_OK) { clearAcceptTradeMode(my_trade, his_trade); - hisCanCompleteInfo.Status = TRADE_STATUS_CLOSE_WINDOW; + hisCanCompleteInfo.Status = TRADE_STATUS_FAILED; SendTradeStatus(hisCanCompleteInfo); - hisCanCompleteInfo.IsTargetResult = true; + hisCanCompleteInfo.FailureForYou = true; trader->GetSession()->SendTradeStatus(hisCanCompleteInfo); my_trade->SetAccepted(false); his_trade->SetAccepted(false); @@ -647,8 +545,8 @@ void WorldSession::HandleBeginTradeOpcode(WorldPacket& /*recvPacket*/) if (!my_trade) return; - TradeStatusInfo info; - info.Status = TRADE_STATUS_OPEN_WINDOW; + WorldPackets::Trade::TradeStatus info; + info.Status = TRADE_STATUS_INITIATED; my_trade->GetTrader()->GetSession()->SendTradeStatus(info); SendTradeStatus(info); } @@ -658,7 +556,7 @@ void WorldSession::SendCancelTrade() if (PlayerRecentlyLoggedOut() || PlayerLogout()) return; - TradeStatusInfo info; + WorldPackets::Trade::TradeStatus info; info.Status = TRADE_STATUS_TRADE_CANCELED; SendTradeStatus(info); } @@ -670,32 +568,12 @@ void WorldSession::HandleCancelTradeOpcode(WorldPacket& /*recvPacket*/) _player->TradeCancel(true); } -void WorldSession::HandleInitiateTradeOpcode(WorldPacket& recvPacket) +void WorldSession::HandleInitiateTradeOpcode(WorldPackets::Trade::InitiateTrade& initiateTrade) { - ObjectGuid guid; - - guid[0] = recvPacket.ReadBit(); - guid[3] = recvPacket.ReadBit(); - guid[5] = recvPacket.ReadBit(); - guid[1] = recvPacket.ReadBit(); - guid[4] = recvPacket.ReadBit(); - guid[6] = recvPacket.ReadBit(); - guid[7] = recvPacket.ReadBit(); - guid[2] = recvPacket.ReadBit(); - - recvPacket.ReadByteSeq(guid[7]); - recvPacket.ReadByteSeq(guid[4]); - recvPacket.ReadByteSeq(guid[3]); - recvPacket.ReadByteSeq(guid[5]); - recvPacket.ReadByteSeq(guid[1]); - recvPacket.ReadByteSeq(guid[2]); - recvPacket.ReadByteSeq(guid[6]); - recvPacket.ReadByteSeq(guid[0]); - if (GetPlayer()->m_trade) return; - TradeStatusInfo info; + WorldPackets::Trade::TradeStatus info; if (!GetPlayer()->IsAlive()) { info.Status = TRADE_STATUS_YOU_DEAD; @@ -730,7 +608,7 @@ void WorldSession::HandleInitiateTradeOpcode(WorldPacket& recvPacket) return; } - Player* pOther = ObjectAccessor::FindPlayer(guid); + Player* pOther = ObjectAccessor::FindPlayer(initiateTrade.Guid); if (!pOther) { @@ -808,7 +686,7 @@ void WorldSession::HandleInitiateTradeOpcode(WorldPacket& recvPacket) pOther->m_trade = new TradeData(pOther, _player); info.Status = TRADE_STATUS_BEGIN_TRADE; - info.TraderGuid = _player->GetGUID(); + info.Partner = _player->GetGUID(); pOther->GetSession()->SendTradeStatus(info); } @@ -821,6 +699,7 @@ void WorldSession::HandleSetTradeGoldOpcode(WorldPacket& recvPacket) if (!my_trade) return; + my_trade->UpdateClientStateIndex(); my_trade->SetMoney(gold); } @@ -839,7 +718,7 @@ void WorldSession::HandleSetTradeItemOpcode(WorldPacket& recvPacket) if (!my_trade) return; - TradeStatusInfo info; + WorldPackets::Trade::TradeStatus info; // invalid slot number if (tradeSlot >= TRADE_SLOT_COUNT) { @@ -868,10 +747,12 @@ void WorldSession::HandleSetTradeItemOpcode(WorldPacket& recvPacket) return; } + my_trade->UpdateClientStateIndex(); + if (tradeSlot != TRADE_SLOT_NONTRADED && item->IsBindedNotWith(my_trade->GetTrader())) { info.Status = TRADE_STATUS_NOT_ON_TAPLIST; - info.Slot = tradeSlot; + info.TradeSlot = tradeSlot; SendTradeStatus(info); return; } @@ -888,6 +769,8 @@ void WorldSession::HandleClearTradeItemOpcode(WorldPacket& recvPacket) if (!my_trade) return; + my_trade->UpdateClientStateIndex(); + // invalid slot number if (tradeSlot >= TRADE_SLOT_COUNT) return; diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index d6444e84cb..9f48640415 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -4057,38 +4057,38 @@ enum SpellFamilyNames enum TradeStatus { - TRADE_STATUS_OPEN_WINDOW = 0, + TRADE_STATUS_INITIATED = 0, // 1 - Related to EVENT_PLAYER_MONEY - TRADE_STATUS_NOT_ON_TAPLIST = 2, // Related to trading soulbound loot items - TRADE_STATUS_YOU_LOGOUT = 3, - TRADE_STATUS_IGNORE_YOU = 4, - TRADE_STATUS_TARGET_DEAD = 5, - TRADE_STATUS_TRADE_ACCEPT = 6, - TRADE_STATUS_TARGET_LOGOUT = 7, + TRADE_STATUS_NOT_ON_TAPLIST = 2, // Related to trading soulbound loot items + TRADE_STATUS_YOU_LOGOUT = 3, + TRADE_STATUS_IGNORE_YOU = 4, + TRADE_STATUS_TARGET_DEAD = 5, + TRADE_STATUS_TRADE_ACCEPT = 6, + TRADE_STATUS_TARGET_LOGOUT = 7, // 8 - nonexistent - TRADE_STATUS_TRADE_COMPLETE = 9, - TRADE_STATUS_TRIAL_ACCOUNT = 10, // Trial accounts can not perform that action + TRADE_STATUS_TRADE_COMPLETE = 9, + TRADE_STATUS_TRIAL_ACCOUNT = 10, // Trial accounts can not perform that action // 11 - nonexistent - TRADE_STATUS_BEGIN_TRADE = 12, - TRADE_STATUS_YOU_DEAD = 13, + TRADE_STATUS_BEGIN_TRADE = 12, + TRADE_STATUS_YOU_DEAD = 13, // 14 - nonexistent // 15 - nonexistent - TRADE_STATUS_TARGET_TO_FAR = 16, - TRADE_STATUS_NO_TARGET = 17, - TRADE_STATUS_BUSY_2 = 18, - TRADE_STATUS_CURRENCY_NOT_TRADABLE = 19, // new 4.x - TRADE_STATUS_WRONG_FACTION = 20, - TRADE_STATUS_BUSY = 21, - // 22 - equivalent to 335 unk status 9 - TRADE_STATUS_TRADE_CANCELED = 23, - TRADE_STATUS_CURRENCY = 24, // new 4.x - TRADE_STATUS_BACK_TO_TRADE = 25, - TRADE_STATUS_WRONG_REALM = 26, // You can only trade conjured items... (cross realm BG related). - TRADE_STATUS_YOU_STUNNED = 27, + TRADE_STATUS_TARGET_TO_FAR = 16, + TRADE_STATUS_NO_TARGET = 17, + TRADE_STATUS_BUSY_2 = 18, + TRADE_STATUS_CURRENCY_NOT_TRADABLE = 19, // new 4.x + TRADE_STATUS_WRONG_FACTION = 20, + TRADE_STATUS_BUSY = 21, + TRADE_STATUS_STATE_CHANGED = 22, + TRADE_STATUS_TRADE_CANCELED = 23, + TRADE_STATUS_CURRENCY = 24, // new 4.x + TRADE_STATUS_UNACCEPTED = 25, + TRADE_STATUS_WRONG_REALM = 26, // You can only trade conjured items... (cross realm BG related). + TRADE_STATUS_YOU_STUNNED = 27, // 28 - nonexistent - TRADE_STATUS_TARGET_STUNNED = 29, + TRADE_STATUS_TARGET_STUNNED = 29, // 30 - nonexistent - TRADE_STATUS_CLOSE_WINDOW = 31, + TRADE_STATUS_FAILED = 31 }; enum XPColorChar : uint8 diff --git a/src/server/game/Server/Packets/AllPackets.h b/src/server/game/Server/Packets/AllPackets.h index b67c843ceb..fd0964e0a5 100644 --- a/src/server/game/Server/Packets/AllPackets.h +++ b/src/server/game/Server/Packets/AllPackets.h @@ -37,6 +37,7 @@ #include "QueryPackets.h" #include "SpellPackets.h" #include "SystemPackets.h" +#include "TradePackets.h" #include "VehiclePackets.h" #include "WhoPackets.h" #include "WorldStatePackets.h" diff --git a/src/server/game/Server/Packets/TradePackets.cpp b/src/server/game/Server/Packets/TradePackets.cpp new file mode 100644 index 0000000000..4971050bc0 --- /dev/null +++ b/src/server/game/Server/Packets/TradePackets.cpp @@ -0,0 +1,195 @@ +/* +* This file is part of the TrinityCore Project. See AUTHORS file for Copyright information +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by the +* Free Software Foundation; either version 2 of the License, or (at your +* option) any later version. +* +* This program is distributed in the hope that it will be useful, but WITHOUT +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +* more details. +* +* You should have received a copy of the GNU General Public License along +* with this program. If not, see . +*/ + +#include "TradePackets.h" + +void WorldPackets::Trade::InitiateTrade::Read() +{ + Guid[0] = _worldPacket.ReadBit(); + Guid[3] = _worldPacket.ReadBit(); + Guid[5] = _worldPacket.ReadBit(); + Guid[1] = _worldPacket.ReadBit(); + Guid[4] = _worldPacket.ReadBit(); + Guid[6] = _worldPacket.ReadBit(); + Guid[7] = _worldPacket.ReadBit(); + Guid[2] = _worldPacket.ReadBit(); + + _worldPacket.ReadByteSeq(Guid[7]); + _worldPacket.ReadByteSeq(Guid[4]); + _worldPacket.ReadByteSeq(Guid[3]); + _worldPacket.ReadByteSeq(Guid[5]); + _worldPacket.ReadByteSeq(Guid[1]); + _worldPacket.ReadByteSeq(Guid[2]); + _worldPacket.ReadByteSeq(Guid[6]); + _worldPacket.ReadByteSeq(Guid[0]); +} + +WorldPacket const* WorldPackets::Trade::TradeStatus::Write() +{ + _worldPacket.WriteBit(PartnerIsSameBnetAccount); + _worldPacket.WriteBits(Status, 5); + + switch (Status) + { + case TRADE_STATUS_BEGIN_TRADE: + _worldPacket.WriteBit(Partner[2]); + _worldPacket.WriteBit(Partner[4]); + _worldPacket.WriteBit(Partner[6]); + _worldPacket.WriteBit(Partner[0]); + _worldPacket.WriteBit(Partner[1]); + _worldPacket.WriteBit(Partner[3]); + _worldPacket.WriteBit(Partner[7]); + _worldPacket.WriteBit(Partner[5]); + _worldPacket.FlushBits(); + + _worldPacket.WriteByteSeq(Partner[4]); + _worldPacket.WriteByteSeq(Partner[1]); + _worldPacket.WriteByteSeq(Partner[2]); + _worldPacket.WriteByteSeq(Partner[3]); + _worldPacket.WriteByteSeq(Partner[0]); + _worldPacket.WriteByteSeq(Partner[7]); + _worldPacket.WriteByteSeq(Partner[6]); + _worldPacket.WriteByteSeq(Partner[5]); + break; + case TRADE_STATUS_INITIATED: + _worldPacket << uint32(ID); + break; + case TRADE_STATUS_FAILED: + _worldPacket.WriteBit(FailureForYou); + _worldPacket.FlushBits(); + + _worldPacket << int32(BagResult); + _worldPacket << uint32(ItemID); // @todo: validate + break; + case TRADE_STATUS_WRONG_REALM: + case TRADE_STATUS_NOT_ON_TAPLIST: + _worldPacket << uint8(TradeSlot); + break; + case TRADE_STATUS_CURRENCY: // Not implemented + case TRADE_STATUS_CURRENCY_NOT_TRADABLE: // Not implemented + // Blizzard never implemented these, you can only trade currency with the field9 & 1 in CurrencyTypes.DBC, and only two test currencies have that flag + _worldPacket << int32(CurrencyType); + _worldPacket << int32(CurrencyQuantity); + break; + default: + _worldPacket.FlushBits(); + break; + } + + return &_worldPacket; +} + +WorldPacket const* WorldPackets::Trade::TradeUpdated::Write() +{ + _worldPacket << uint32(ID); + _worldPacket << int32(CurrencyType); + _worldPacket << uint64(Gold); + _worldPacket << int32(ProposedEnchantment); + _worldPacket << uint32(ClientStateIndex); + _worldPacket << int32(CurrencyQuantity); + _worldPacket << uint8(WhichPlayer); + _worldPacket << uint32(CurrentStateIndex); + _worldPacket.WriteBits(Items.size(), 22); + + for (WorldPackets::Trade::TradeItem const& item : Items) + { + _worldPacket.WriteBit(item.GiftCreator[7]); + _worldPacket.WriteBit(item.GiftCreator[1]); + _worldPacket.WriteBit(item.Unwrapped.has_value()); + _worldPacket.WriteBit(item.GiftCreator[3]); + + if (item.Unwrapped.has_value()) + { + _worldPacket.WriteBit(item.Unwrapped->Creator[7]); + _worldPacket.WriteBit(item.Unwrapped->Creator[1]); + _worldPacket.WriteBit(item.Unwrapped->Creator[4]); + _worldPacket.WriteBit(item.Unwrapped->Creator[6]); + _worldPacket.WriteBit(item.Unwrapped->Creator[2]); + _worldPacket.WriteBit(item.Unwrapped->Creator[3]); + _worldPacket.WriteBit(item.Unwrapped->Creator[5]); + _worldPacket.WriteBit(item.Unwrapped->Lock); + _worldPacket.WriteBit(item.Unwrapped->Creator[0]); + } + + _worldPacket.WriteBit(item.GiftCreator[6]); + _worldPacket.WriteBit(item.GiftCreator[4]); + _worldPacket.WriteBit(item.GiftCreator[2]); + _worldPacket.WriteBit(item.GiftCreator[0]); + _worldPacket.WriteBit(item.GiftCreator[5]); + } + + _worldPacket.FlushBits(); + + for (WorldPackets::Trade::TradeItem const& item : Items) + { + if (item.Unwrapped.has_value()) + { + _worldPacket.WriteByteSeq(item.Unwrapped->Creator[1]); + + _worldPacket << int32(item.Unwrapped->EnchantID); + for (int32 socketEnchant : item.Unwrapped->SocketEnchant) + _worldPacket << int32(socketEnchant); + + _worldPacket << uint32(item.Unwrapped->MaxDurability); + + _worldPacket.WriteByteSeq(item.Unwrapped->Creator[6]); + _worldPacket.WriteByteSeq(item.Unwrapped->Creator[2]); + _worldPacket.WriteByteSeq(item.Unwrapped->Creator[7]); + _worldPacket.WriteByteSeq(item.Unwrapped->Creator[4]); + + _worldPacket << int32(item.Unwrapped->ReforgeEnchantmentID); + _worldPacket << uint32(item.Unwrapped->Durability); + _worldPacket << int32(item.Unwrapped->Item.RandomPropertiesID); + + _worldPacket.WriteByteSeq(item.Unwrapped->Creator[3]); + + _worldPacket << int32(0); // unk + + _worldPacket.WriteByteSeq(item.Unwrapped->Creator[0]); + + _worldPacket << int32(item.Unwrapped->Charges); + _worldPacket << int32(item.Unwrapped->Item.RandomPropertiesSeed); + + _worldPacket.WriteByteSeq(item.Unwrapped->Creator[5]); + } + + _worldPacket.WriteByteSeq(item.GiftCreator[6]); + _worldPacket.WriteByteSeq(item.GiftCreator[1]); + _worldPacket.WriteByteSeq(item.GiftCreator[7]); + _worldPacket.WriteByteSeq(item.GiftCreator[4]); + + _worldPacket << int32(item.EntryID); + + _worldPacket.WriteByteSeq(item.GiftCreator[0]); + + _worldPacket << int32(item.StackCount); + + _worldPacket.WriteByteSeq(item.GiftCreator[5]); + + _worldPacket << uint8(item.Slot); + + _worldPacket.WriteByteSeq(item.GiftCreator[2]); + _worldPacket.WriteByteSeq(item.GiftCreator[3]); + } + + return &_worldPacket; +} + +void WorldPackets::Trade::AcceptTrade::Read() +{ + _worldPacket >> StateIndex; +} diff --git a/src/server/game/Server/Packets/TradePackets.h b/src/server/game/Server/Packets/TradePackets.h new file mode 100644 index 0000000000..d38dc945de --- /dev/null +++ b/src/server/game/Server/Packets/TradePackets.h @@ -0,0 +1,111 @@ +/* +* This file is part of the TrinityCore Project. See AUTHORS file for Copyright information +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by the +* Free Software Foundation; either version 2 of the License, or (at your +* option) any later version. +* +* This program is distributed in the hope that it will be useful, but WITHOUT +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +* more details. +* +* You should have received a copy of the GNU General Public License along +* with this program. If not, see . +*/ + +#ifndef TradePackets_h__ +#define TradePackets_h__ + +#include "Packet.h" +#include "ItemPacketsCommon.h" +#include "ObjectGuid.h" +#include "SharedDefines.h" + +namespace WorldPackets +{ + namespace Trade + { + class InitiateTrade final : public ClientPacket + { + public: + InitiateTrade(WorldPacket&& packet) : ClientPacket(CMSG_INITIATE_TRADE, std::move(packet)) { } + + void Read() override; + + ObjectGuid Guid; + }; + + class TradeStatus final : public ServerPacket + { + public: + TradeStatus() : ServerPacket(SMSG_TRADE_STATUS, 1 + 1 + 8 + 4 + 4 + 1 + 4 + 4 + 4 + 1) { } + + WorldPacket const* Write() override; + + ::TradeStatus Status = TRADE_STATUS_INITIATED; + ObjectGuid Partner; + int32 CurrencyType = 0; + int32 CurrencyQuantity = 0; + int32 BagResult = 0; + uint32 ItemID = 0; + uint32 ID = 0; + uint8 TradeSlot = 0; + bool FailureForYou = false; + bool PartnerIsSameBnetAccount = false; + }; + + struct UnwrappedTradeItem + { + Item::ItemInstance Item; + ObjectGuid Creator; + int32 EnchantID = 0; + int32 ReforgeEnchantmentID = 0; + int32 Charges = 0; + uint32 MaxDurability = 0; + uint32 Durability = 0; + std::array SocketEnchant = { }; + bool Lock = false; + }; + + struct TradeItem + { + uint8 Slot = 0; + int32 EntryID = 0; + int32 StackCount = 0; + ObjectGuid GiftCreator; + Optional Unwrapped; + }; + + class TradeUpdated final : public ServerPacket + { + public: + TradeUpdated() : ServerPacket(SMSG_TRADE_UPDATED, 4 + 4 + 8 + 4 + 4 + 4 + 1 + 4 + 3) { } + + WorldPacket const* Write() override; + + uint64 Gold = 0; + uint32 ID = 0; + uint32 CurrentStateIndex = 0; + uint32 ClientStateIndex = 0; + int32 CurrencyType = 0; + int32 CurrencyQuantity = 0; + int32 ProposedEnchantment = 0; + uint8 WhichPlayer = 0; + std::vector Items; + }; + + class AcceptTrade final : public ClientPacket + { + public: + AcceptTrade(WorldPacket&& packet) : ClientPacket(CMSG_ACCEPT_TRADE, std::move(packet)) { } + + void Read() override; + + uint32 StateIndex = 0; + }; + } +} + +#endif diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index 13b1f9c2e7..b185cc7c31 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -1294,7 +1294,7 @@ void OpcodeTable::Initialize() DEFINE_SERVER_OPCODE_HANDLER(SMSG_TOGGLE_XP_GAIN, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_TOTEM_CREATED, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_TRADE_STATUS, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); - DEFINE_SERVER_OPCODE_HANDLER(SMSG_TRADE_STATUS_EXTENDED, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); + DEFINE_SERVER_OPCODE_HANDLER(SMSG_TRADE_UPDATED, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); DEFINE_SERVER_OPCODE_HANDLER(SMSG_TRAINER_BUY_FAILED, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_TRAINER_BUY_SUCCEEDED, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_TRAINER_LIST, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index 4870190681..1f93bb84ff 100644 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -1254,7 +1254,7 @@ enum OpcodeServer SMSG_TOGGLE_XP_GAIN = 0x6704, SMSG_TOTEM_CREATED = 0x2414, SMSG_TRADE_STATUS = 0x5CA3, - SMSG_TRADE_STATUS_EXTENDED = 0x70A2, + SMSG_TRADE_UPDATED = 0x70A2, SMSG_TRAINER_BUY_FAILED = 0x0004, SMSG_TRAINER_BUY_SUCCEEDED = 0x6A05, SMSG_TRAINER_LIST = 0x4414, diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index dddb21aab5..719e9e7c78 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -54,7 +54,6 @@ struct AuctionEntry; struct DeclinedName; struct ItemTemplate; struct MovementInfo; -struct TradeStatusInfo; namespace lfg { @@ -209,6 +208,13 @@ namespace WorldPackets class UpdateMissileTrajectory; } + namespace Trade + { + class AcceptTrade; + class InitiateTrade; + class TradeStatus; + } + namespace Who { class WhoRequestPkt; @@ -513,7 +519,7 @@ class TC_GAME_API WorldSession void SendAttackStop(Unit const* enemy); - void SendTradeStatus(TradeStatusInfo const& status); + void SendTradeStatus(WorldPackets::Trade::TradeStatus& info); void SendUpdateTrade(bool trader_data = true); void SendCancelTrade(); @@ -878,13 +884,13 @@ class TC_GAME_API WorldSession void HandleDuelAcceptedOpcode(WorldPacket& recvPacket); void HandleDuelCancelledOpcode(WorldPacket& recvPacket); - void HandleAcceptTradeOpcode(WorldPacket& recvPacket); + void HandleAcceptTradeOpcode(WorldPackets::Trade::AcceptTrade& packet); void HandleBeginTradeOpcode(WorldPacket& recvPacket); void HandleBusyTradeOpcode(WorldPacket& recvPacket); void HandleCancelTradeOpcode(WorldPacket& recvPacket); void HandleClearTradeItemOpcode(WorldPacket& recvPacket); void HandleIgnoreTradeOpcode(WorldPacket& recvPacket); - void HandleInitiateTradeOpcode(WorldPacket& recvPacket); + void HandleInitiateTradeOpcode(WorldPackets::Trade::InitiateTrade& packet); void HandleSetTradeGoldOpcode(WorldPacket& recvPacket); void HandleSetTradeItemOpcode(WorldPacket& recvPacket); void HandleUnacceptTradeOpcode(WorldPacket& recvPacket);