diff options
author | Stijn Buys <ingar@osirion.org> | 2010-11-13 14:25:39 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2010-11-13 14:25:39 +0000 |
commit | 871be21e83502a909620a5bcfcd09e3257ed0518 (patch) | |
tree | 8aee5b25fd5c3d43e55e1b92e114acca58c1172a /src/core/entity.h | |
parent | 650cca5da5e15b9d4a85e7f734515f538b0cc0f3 (diff) |
corrected a bug where ship names got erased,
made core::Entity::info() const, added core::Info::find() to get non-const *core::Info pointers
Diffstat (limited to 'src/core/entity.h')
-rw-r--r-- | src/core/entity.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/entity.h b/src/core/entity.h index 1996e10..5c34f97 100644 --- a/src/core/entity.h +++ b/src/core/entity.h @@ -194,7 +194,7 @@ public: } /// entity info - inline Info *info() const { + inline const Info *info() const { return entity_info; } @@ -328,7 +328,7 @@ public: */ void set_inventory(Inventory *inventory); - void set_info(Info *info); + void set_info(const Info *info); /// set the timestamp when the entity was last alive void set_keepalive(unsigned long timestamp) { @@ -492,7 +492,7 @@ private: Menus entity_menus; Inventory* entity_inventory; - Info* entity_info; + const Info* entity_info; Extension* entity_extension[4]; |