From b460b3193e54b7364bb75ff26ce6f999887e454b Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Fri, 12 Nov 2010 16:24:17 +0000
Subject: 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()

---
 src/core/entity.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'src/core/entity.h')

diff --git a/src/core/entity.h b/src/core/entity.h
index 48dd949..1996e10 100644
--- a/src/core/entity.h
+++ b/src/core/entity.h
@@ -402,6 +402,16 @@ public:
 	virtual void serialize_server_update(std::ostream & os) const;
 
 	/* ---- static --------------------------------------------- */
+	
+	/// default infotype for entities
+	static inline const InfoType *infotype() {
+		return entity_infotype;
+	}
+	
+	/// set the default infotype for entities
+	static inline void set_infotype(const InfoType *infotype) {
+		entity_infotype = infotype;
+	}
 
 	/// type definition for the entity registry
 	typedef std::map<unsigned int, Entity*> Registry;
@@ -492,6 +502,9 @@ private:
 	static size_t		entity_nextid;
 
 	static void add(Entity *ent);
+	
+	static const InfoType 	*entity_infotype;
+
 };
 
 
-- 
cgit v1.2.3