diff options
author | Stijn Buys <ingar@osirion.org> | 2010-11-12 16:24:17 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2010-11-12 16:24:17 +0000 |
commit | b460b3193e54b7364bb75ff26ce6f999887e454b (patch) | |
tree | d35e4972fd3ee54b9922908e3791a53bae96af14 /src/core/entity.h | |
parent | c0c2a0ccc335b00983bf69b99b7a44505ed24b47 (diff) |
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()
Diffstat (limited to 'src/core/entity.h')
-rw-r--r-- | src/core/entity.h | 13 |
1 files changed, 13 insertions, 0 deletions
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; + }; |