Moved merc save data from extended player profile to new merc table, save merc buffs, added cure and rez spells to healer merc.

zone/client.h

@@ -1095,9 +1095,15 @@ public:
 	void SendXTargetPacket(uint32 Slot, Mob *m);
 	void RemoveGroupXTargets();
 	void ShowXTargets(Client *c);
+	void InitializeMercInfo();
 	inline uint32 GetMercID()	const { return mercid; }
+	inline uint8 GetMercSlot()	const { return mercSlot; }
 	void SetMercID( uint32 newmercid) { mercid = newmercid; }
+	void SetMercSlot( uint8 newmercslot) { mercSlot = newmercslot; }
 	Merc* GetMerc();
+	MercInfo& GetMercInfo(uint8 slot) { return m_mercinfo[slot]; }
+	MercInfo& GetMercInfo() { return m_mercinfo[mercSlot]; }
+	uint8 GetNumMercs();
 	void SetMerc(Merc* newmerc);
 	void SendMercMerchantResponsePacket(int32 response_type);
 	void SendMercenaryUnknownPacket(uint8 type);
@@ -1109,7 +1115,7 @@ public:
 	void SendClearMercInfo();
 	void SuspendMercCommand();
 	void SpawnMercOnZone();
-	void SpawnMerc(Merc* merc);
+	void SpawnMerc(Merc* merc, bool setMaxStats);
 	void UpdateMercTimer();
 	void UpdateMercLevel();
 	void CheckMercSuspendTimer();
@@ -1257,7 +1263,8 @@ private:
 	uint16				CustomerID;
 	uint32              account_creation;
 	uint8				firstlogon;
-	uint32              mercid;
+	uint32              mercid;				// current merc 
+	uint8				mercSlot;			// selected merc slot
 	bool	Trader;
 	bool	Buyer;
 	string	BuyerWelcomeMessage;
@@ -1273,7 +1280,7 @@ private:
 	Object*						m_tradeskill_object;
 	PetInfo						m_petinfo; // current pet data, used while loading from and saving to DB
 	PetInfo						m_suspendedminion; // pet data for our suspended minion.
-	MercInfo					m_mercinfo; // current mercenary
+	MercInfo					m_mercinfo[MAXMERCS]; // current mercenary
 	InspectMessage_Struct		m_inspect_message;
 
 	void NPCSpawn(const Seperator* sep);