Removed shipmodel npcname support,

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

1 files changed, 1 insertions, 20 deletions

diff --git a/src/game/base/shipmodel.h b/src/game/base/shipmodel.h
index 2231fea..9849cd0 100644
--- a/src/game/base/shipmodel.h
+++ b/src/game/base/shipmodel.h
@@ -114,14 +114,6 @@ public:
 		return shipmodel_radius;
 	}
 	
-	/**
-	 * @brief name used for NPCs with this ship model
-	 * */
-	inline const std::string & npc_name() const
-	{
-		return shipmodel_npc_name;
-	}
-	
 	/// entity template
 	inline const Template *model_template() const
 	{
@@ -238,15 +230,7 @@ protected:
 	{
 		shipmodel_angular_damping = angular_damping;
 	}
-	
-	/**
-	 * @brief set the name used for NPCs with this ship model
-	 * */
-	inline void set_npc_name(const std::string name)
-	{
-		shipmodel_npc_name.assign(name);
-	}
-	
+		
 public:
 	/**
 	 * @brief generate specifications info.
@@ -285,7 +269,6 @@ private:
 	float			shipmodel_turn_force;
 	float			shipmodel_roll_force;
 	
-//	float			shipmodel_maxspeed;
 	float			shipmodel_maxcargo;	
 	float			shipmodel_maxarmor;
 	float			shipmodel_maxshield;
@@ -295,8 +278,6 @@ private:
 	
 	const Template		*shipmodel_template;
 	
-	std::string		shipmodel_npc_name;
-	
 	/* --- static ----------------------------------------------------- */
 	
 	static core::InfoType *shipmodel_infotype;