Merge and compile fixes (non-bot, will do bots later)

zone/zone.h

@@ -29,6 +29,7 @@
 #include "spawngroup.h"
 #include "aa_ability.h"
 #include "pathfinder_interface.h"
+#include "global_loot_manager.h"
 
 struct ZonePoint
 {
@@ -209,6 +210,7 @@ public:
 	void	LoadAlternateCurrencies();
 	void	LoadNPCEmotes(LinkedList<NPC_Emote_Struct*>* NPCEmoteList);
 	void	ReloadWorld(uint32 Option);
+	void	ReloadMerchants();
 
 	Map*	zonemap;
 	WaterMap* watermap;
@@ -222,7 +224,7 @@ public:
 	void	SetDate(uint16 year, uint8 month, uint8 day, uint8 hour, uint8 minute);
 	void SetTime(uint8 hour, uint8 minute, bool update_world = true);
 
-	void	weatherSend();
+	void	weatherSend(Client* client = nullptr);
 	bool	CanBind() const { return(can_bind); }
 	bool	IsCity() const { return(is_city); }
 	bool	CanDoCombat() const { return(can_combat); }
@@ -268,6 +270,15 @@ public:
 	void    UpdateHotzone();
 	std::unordered_map<int, item_tick_struct> tick_items;
 
+	inline std::vector<int> GetGlobalLootTables(NPC *mob) const { return m_global_loot.GetGlobalLootTables(mob); }
+	inline void AddGlobalLootEntry(GlobalLootEntry &in) { return m_global_loot.AddEntry(in); }
+	inline void ShowZoneGlobalLoot(Client *to) { m_global_loot.ShowZoneGlobalLoot(to); }
+	inline void ShowNPCGlobalLoot(Client *to, NPC *who) { m_global_loot.ShowNPCGlobalLoot(to, who); }
+
+	void RequestUCSServerStatus();
+	void SetUCSServerAvailable(bool ucss_available, uint32 update_timestamp);
+	bool IsUCSServerAvailable() { return m_ucss_available; }
+
 	// random object that provides random values for the zone
 	EQEmu::Random random;
 
@@ -346,6 +357,11 @@ private:
 	QGlobalCache *qGlobals;
 
 	Timer	hotzone_timer;
+
+	GlobalLootManager m_global_loot;
+
+	bool m_ucss_available;
+	uint32 m_last_ucss_update;
 };
 
 #endif