pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 04:56:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pass 4 - Start Trader working

Browse Source
This commit is contained in:
Mitch Freeman
2025-03-30 18:41:25 -03:00
parent 08d9c2d4f6
commit 8af139aef0
5 changed files with 97 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/inventory.cpp
+1
View File
@@ -650,6 +650,7 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
// put item into inventory
if (to_slot == EQ::invslot::slotCursor) {
inst->CreateSerialNumber2();
PushItemOnCursor(*inst);
SendItemPacket(EQ::invslot::slotCursor, inst, ItemPacketLimbo);
} else {
zone/trading.cpp
+40 -11
View File
@@ -756,20 +756,49 @@ bool Client::CheckTradeNonDroppable()
void Client::TraderShowItems()
{
auto outapp = new EQApplicationPacket(OP_Trader, sizeof(Trader3_Struct));
auto data = (Trader3_Struct *) outapp->pBuffer;
std::stringstream ss{};
cereal::BinaryOutputArchive ar(ss);
auto trader_items = TraderRepository::GetWhere(database, fmt::format("`char_id` = '{}'", CharacterID()));
uint32 item_limit = trader_items.size() >= GetInv().GetLookup()->InventoryTypeSize.Bazaar ?
GetInv().GetLookup()->InventoryTypeSize.Bazaar :
trader_items.size();
//FIX
for (int i = 0; i < item_limit; i++) {
data->item_cost[i] = trader_items.at(i).item_cost;
strn0cpy(data->serial_number[i], trader_items.at(i).item_sn.data(), sizeof(data->serial_number[i]));
auto trader_items = TraderRepository::GetWhere(database, fmt::format("`char_id` = '{}'", CharacterID()));
if (trader_items.empty()) {
return;
}
data->action = ListTraderItems;
TraderClientMessaging_Struct tcm{};
tcm.action = ListTraderItems;
for (auto const &t: trader_items) {
TraderItems_Struct items{};
items.serial_number = t.item_sn;
items.item_id = t.item_id;
items.item_cost = t.item_cost;
tcm.items.push_back(items);
}
{ ar(tcm); }
uint32 packet_size = ss.str().length();
auto outapp = new EQApplicationPacket(OP_Trader, packet_size);
memcpy(outapp->pBuffer, ss.str().data(), packet_size);
// // uint32 item_limit = trader_items.size() >= GetInv().GetLookup()->InventoryTypeSize.Bazaar ?
// // GetInv().GetLookup()->InventoryTypeSize.Bazaar :
// // trader_items.size();
// uint32 item_limit = GetInv().GetLookup()->InventoryTypeSize.Bazaar;
// //FIX
//
// for (int i = 0; i < trader_items.size(); i++) {
// data->items[i].cost = trader_items.at(i).item_cost;
// strn0cpy(data->items[i].sn, trader_items.at(i).item_sn.data(), sizeof(data->items[i].sn[i]));
// }
//
// for (int i = trader_items.size(); i < item_limit; i++) {
// data->items[i].cost = 0;
// strn0cpy(data->items[i].sn, "0000000000000000", sizeof(data->items[i].sn));
// }
//
// data->action = ListTraderItems;
QueuePacket(outapp);
safe_delete(outapp);