moved global entity info type to core::Entity::infotype(),

automatic generation of jumppoint and jumpgate names and descriptions,
prepared game code for the seperation of Entity::radius() and Model::radius()

1 files changed, 7 insertions, 5 deletions

diff --git a/src/game/base/shipmodel.h b/src/game/base/shipmodel.h
index 9da50a6..25473d4 100644
--- a/src/game/base/shipmodel.h
+++ b/src/game/base/shipmodel.h
@@ -34,8 +34,8 @@ public:
 	}
 	
 	/// indicates if players can dock this ship model
-	inline const bool dock() const {
-		return shipmodel_dock;
+	inline const bool dockable() const {
+		return shipmodel_dockable;
 	}
 	
 	/// default mass
@@ -139,8 +139,8 @@ protected:
 	}
 	
 	/// set dock capability
-	inline void set_dock(const bool dock) {
-		shipmodel_dock = dock;
+	inline void set_dockable(const bool dockable) {
+		shipmodel_dockable = dockable;
 	}
 	
 	/// set radius
@@ -166,6 +166,8 @@ public:
 	
 	static bool init();
 	
+	static void done();
+	
 	static void list();
 	
 	static inline const core::InfoType *infotype() {
@@ -187,7 +189,7 @@ private:
 	float			shipmodel_maxcargo;
 	
 	bool			shipmodel_jumpdrive;
-	bool			shipmodel_dock;	
+	bool			shipmodel_dockable;	
 	
 	const Template		*shipmodel_template;