Merge

zone/npc.h

@@ -18,20 +18,17 @@
 #ifndef NPC_H
 #define NPC_H
 
-class NPC;
-#include "zonedb.h"
-#include "mob.h"
-//#include "spawn.h"
-
-#include <list>
-#include <deque>
-
-#include "spawn2.h"
-#include "../common/loottable.h"
-#include "zonedump.h"
-#include "qglobals.h"
 #include "../common/rulesys.h"
 
+#include "mob.h"
+#include "qglobals.h"
+#include "zonedb.h"
+#include "zonedump.h"
+
+#include <deque>
+#include <list>
+
+
 #ifdef _WINDOWS
 	#define M_PI	3.141592
 #endif
@@ -88,8 +85,12 @@ struct AISpellsVar_Struct {
 	uint8	idle_beneficial_chance;
 };
 
-
 class AA_SwarmPetInfo;
+class Client;
+class Group;
+class Raid;
+class Spawn2;
+struct Item_Struct;
 
 class NPC : public Mob
 {
@@ -353,8 +354,9 @@ public:
 	const bool GetCombatEvent() const { return combat_event; }
 	void SetCombatEvent(bool b) { combat_event = b; }
 
-	//The corpse we make can only be looted by people who got credit for the kill
+	/* Only allows players that killed corpse to loot */
 	const bool HasPrivateCorpse() const { return NPCTypedata->private_corpse; }
+
 	const bool IsUnderwaterOnly() const { return NPCTypedata->underwater; }
 	const char* GetRawNPCTypeName() const { return NPCTypedata->name; }