Removed shipmodel npcname support,

made Patrols load NPC types instead of ship models,
replaces patrol [ship] subsection with a [npc] subsection.

1 files changed, 8 insertions, 1 deletions

diff --git a/src/game/base/patrol.h b/src/game/base/patrol.h
index 0e03234..e4ba19b 100644
--- a/src/game/base/patrol.h
+++ b/src/game/base/patrol.h
@@ -11,6 +11,7 @@
 #include "base/faction.h"
 #include "base/cargo.h"
 #include "base/npc.h"
+#include "base/npctype.h"
 
 namespace game
 {
@@ -76,6 +77,8 @@ public:
 	
 	typedef std::list<WayPoint *> WayPoints;
 	
+	typedef std::list<NPCType *> NPCTypes;
+	
 	typedef std::list<NPC *> Members;
 		
 	Patrol();
@@ -106,6 +109,8 @@ public:
 	void set_faction(Faction *faction);
 	
 	WayPoint *add_waypoint();
+	
+	NPCType *add_npctype();
 
 	virtual void validate();
 	
@@ -113,7 +118,7 @@ public:
 	
 	void add_member(NPC *npc);
 	
-	void erase_member(NPC *npc);
+	void erase_member(NPC *npc);		
 
 private:
 	void set_leader();
@@ -126,6 +131,8 @@ private:
 	
 	Members			patrol_members;
 	
+	NPCTypes		patrol_npctypes;
+	
 	NPC::Profile		patrol_profile;
 	
 	NPC			*patrol_leader;