Merge branch 'master' of https://github.com/EQEmu/Server into integration/multi-tenancy-expansions-repository

2026-09-02 00:06:36 +00:00 · 2020-04-24 01:27:17 -05:00
parent 2159b5db2d 387e1668a5
commit 43ff59d7db
6 changed files with 164 additions and 74 deletions
@@ -167,6 +167,7 @@ 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; }