From 5e007e18d161a5fb62cb60e0098bda83f18fc2b2 Mon Sep 17 00:00:00 2001 From: sruon Date: Mon, 17 Mar 2025 20:44:30 -0600 Subject: [PATCH] Bazaar displays item exdata --- src/map/packets/bazaar_item.cpp | 6 ++++-- src/map/packets/trade_update.cpp | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/map/packets/bazaar_item.cpp b/src/map/packets/bazaar_item.cpp index ca11bc4ac52..daa990dcb6a 100644 --- a/src/map/packets/bazaar_item.cpp +++ b/src/map/packets/bazaar_item.cpp @@ -55,7 +55,9 @@ CBazaarItemPacket::CBazaarItemPacket(CItem* PItem, uint8 SlotID, uint16 Tax) ref(0x15) = nextUseTime; ref(0x19) = ((CItemUsable*)PItem)->getUseDelay() + currentTime; } - // 12? characters? seems a bit short. TODO: research this. - std::memcpy(buffer_.data() + 0x1D, PItem->getSignature().c_str(), std::min(PItem->getSignature().size(), 12)); + else + { + std::memcpy(buffer_.data() + 0x11, PItem->m_extra, std::min(CItem::extra_size, 24)); + } } } diff --git a/src/map/packets/trade_update.cpp b/src/map/packets/trade_update.cpp index fec3c6e86ac..6ef3e5f5b8d 100644 --- a/src/map/packets/trade_update.cpp +++ b/src/map/packets/trade_update.cpp @@ -49,7 +49,7 @@ CTradeUpdatePacket::CTradeUpdatePacket(CItem* PItem, uint8 SlotID) ref(0x0F) = ((CItemUsable*)PItem)->getCurrentCharges(); } } - if (PItem->isType(ITEM_LINKSHELL)) + else if (PItem->isType(ITEM_LINKSHELL)) { ref(0x0E) = ((CItemLinkshell*)PItem)->GetLSID(); ref(0x14) = ((CItemLinkshell*)PItem)->GetLSRawColor();