Merge

zone/zonedb.h

@@ -3,11 +3,25 @@
 
 #include "../common/shareddb.h"
 #include "../common/eq_packet_structs.h"
-#include "../common/loottable.h"
-#include "zonedump.h"
 #include "position.h"
 #include "../common/faction.h"
-#include <limits>
+
+class Client;
+class Corpse;
+class Merc;
+class NPC;
+class Petition;
+class Spawn2;
+class SpawnGroupList;
+class ItemInst;
+struct CharacterEventLog_Struct;
+struct Door;
+struct ExtendedProfile_Struct;
+struct NPCType;
+struct PlayerCorpse_Struct;
+struct ZonePoint;
+struct npcDecayTimes_Struct;
+template <class TYPE> class LinkedList;
 
 //#include "doors.h"
 
@@ -164,6 +178,7 @@ struct MercInfo {
 	bool	IsSuspended;
 	uint32	MercTimerRemaining;
 	uint8	Gender;
+	float	MercSize;
 	int32	State;
 	uint32	Stance;
 	int32	hp;
@@ -198,12 +213,6 @@ struct ClientMercEntry {
 	uint32 npcid;
 };
 
-class ItemInst;
-struct FactionMods;
-struct FactionValue;
-struct LootTable_Struct;
-
-
 class ZoneDatabase : public SharedDatabase {
 	typedef std::list<ServerLootItem_Struct*> ItemList;
 public:
@@ -292,7 +301,6 @@ public:
 	bool	NoRentExpired(const char* name);
 
 	/* Corpses  */
-	bool		ClearCorpseItems(uint32 db_id);
 	bool		DeleteItemOffCharacterCorpse(uint32 db_id, uint32 equip_slot, uint32 item_id);
 	uint32		GetCharacterCorpseItemCount(uint32 corpse_id);
 	bool		LoadCharacterCorpseData(uint32 corpse_id, PlayerCorpse_Struct* pcs);