Moved profile definition from NPC to Patrol.

1 files changed, 3 insertions, 25 deletions

diff --git a/src/game/base/npc.h b/src/game/base/npc.h
index 48fff35..8139c9a 100644
--- a/src/game/base/npc.h
+++ b/src/game/base/npc.h
@@ -18,39 +18,19 @@ class NPC : public Ship {
 
 public:
 	/**
-	 * @brief Definse the general profile of the NPC
-	 * The NPC profile is set at creating time and can not be altered.
-	 *
-	 * Freelancer	fallback value
-	 * Convoy	Trade convoy member, prefers trade routes
-	 * Patrol	Police or military, prefers patrol routes
-	 * Guard	Guard an area
-	 * Wingman	wingman, prefers protecting its leader
-	 * */
-	enum Profile { ProfileFreelancer = 0, ProfileConvoy = 1, ProfilePatrol = 2, ProfileGuard = 3, ProfileWingman = 4 };
-	
-	/**
 	 * @brief Defines the general moode of the NPC
 	 * Wander	Wamder around
 	 * Formation	Follow the leader in formation
+	 * Attack	Attack at will
 	 * */
-	enum Mood { MoodWander = 0, MoodFormation = 1 };
+	enum Mood { MoodWander = 0, MoodFormation = 1, MoodAttack = 2};
 	
-	NPC(const Profile profile, const ShipModel *shipmodel);
+	NPC(const ShipModel *shipmodel);
 	virtual ~NPC();
 	
 	/* ---- inspectors ----------------------------------------- */
 
 	/**
-	 * @brief Treturns te general profile of the NPC
-	 * The NPC profile is set at creating time and can not be altered.
-	 * */
-	inline const Profile profile() const
-	{
-		return npc_profile;
-	}
-	
-	/**
 	 * @brief returns the general moode of the NPC
 	 * */
 	inline const Mood mood() const
@@ -103,8 +83,6 @@ public:
 	static NPC *add_wingman(Ship *leader);
 
 private:
-	Profile			npc_profile;
-	
 	Mood			npc_mood;
 	
 	Ship			*npc_leader;