diff options
author | Stijn Buys <ingar@osirion.org> | 2010-09-17 23:05:58 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2010-09-17 23:05:58 +0000 |
commit | a85c3ca1ff34775f2fc93013306dec21b34b0359 (patch) | |
tree | dc45be555858f53413d2477680247c8758b98d2a /src/core/entity.h | |
parent | 417eeaa34b8374de18358cc64511d7298bc33756 (diff) |
Initial inventory loading, ships docking ships
Diffstat (limited to 'src/core/entity.h')
-rw-r--r-- | src/core/entity.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/entity.h b/src/core/entity.h index fea784a..8bf637d 100644 --- a/src/core/entity.h +++ b/src/core/entity.h @@ -189,6 +189,9 @@ public: return entity_destroyed; } + /// list inventory, if available, to console + void list_inventory() const; + /* ---- mutators -------------------------------------------------- */ /// assign entity color @@ -252,10 +255,10 @@ public: entity_radius = radius; } - /* ---- actors ---------------------------------------------------- */ +/* ---- actors ---------------------------------------------------- */ /// called when the entity received a docking request - virtual void dock(core::Entity *entity); + virtual void dock(Entity *entity); /// set flags inline void set_flag(Flags flag) { |