From cd82bd847253e2cb2f9cd89ce8257228227b13d4 Mon Sep 17 00:00:00 2001 From: Alex King <89047260+Kinglykrab@users.noreply.github.com> Date: Wed, 17 May 2023 09:02:14 -0400 Subject: [PATCH] [Cleanup] Remove DumpMerchantList() from zone.cpp/zone.h (#3343) # Notes - This is unused. --- zone/zone.cpp | 15 --------------- zone/zone.h | 1 - 2 files changed, 16 deletions(-) diff --git a/zone/zone.cpp b/zone/zone.cpp index b2e12c7d1..78e618dfd 100644 --- a/zone/zone.cpp +++ b/zone/zone.cpp @@ -353,23 +353,10 @@ bool Zone::LoadGroundSpawns() { return(true); } -void Zone::DumpMerchantList(uint32 npcid) { - std::list tmp_merlist = tmpmerchanttable[npcid]; - std::list::const_iterator tmp_itr; - TempMerchantList ml; - - for (tmp_itr = tmp_merlist.begin(); tmp_itr != tmp_merlist.end(); ++tmp_itr) { - ml = *tmp_itr; - - LogInventory("slot[{}] Orig[{}] Item[{}] Charges[{}]", ml.slot, ml.origslot, ml.item, ml.charges); - } -} - int Zone::SaveTempItem(uint32 merchantid, uint32 npcid, uint32 item, int32 charges, bool sold) { LogInventory("[{}] [{}] charges of [{}]", ((sold) ? "Sold" : "Bought"), charges, item); - //DumpMerchantList(npcid); // Iterate past main items. // If the item being transacted is in this list, return 0; std::list merlist = merchanttable[merchantid]; @@ -436,7 +423,6 @@ int Zone::SaveTempItem(uint32 merchantid, uint32 npcid, uint32 item, int32 charg } tmpmerchanttable[npcid] = tmp_merlist; - //DumpMerchantList(npcid); return ml.slot; } else { @@ -499,7 +485,6 @@ int Zone::SaveTempItem(uint32 merchantid, uint32 npcid, uint32 item, int32 charg ml2.origslot = first_empty_slot; tmp_merlist.push_back(ml2); tmpmerchanttable[npcid] = tmp_merlist; - //DumpMerchantList(npcid); return ml2.slot; } } diff --git a/zone/zone.h b/zone/zone.h index 0e67af6ad..715006646 100755 --- a/zone/zone.h +++ b/zone/zone.h @@ -180,7 +180,6 @@ public: inline void ShowNPCGlobalLoot(Client *to, NPC *who) { m_global_loot.ShowNPCGlobalLoot(to, who); } inline void ShowZoneGlobalLoot(Client *to) { m_global_loot.ShowZoneGlobalLoot(to); } int GetZoneTotalBlockedSpells() { return zone_total_blocked_spells; } - void DumpMerchantList(uint32 npcid); int SaveTempItem(uint32 merchantid, uint32 npcid, uint32 item, int32 charges, bool sold = false); int32 MobsAggroCount() { return aggroedmobs; } DynamicZone *GetDynamicZone();