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.cc | |
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.cc')
-rw-r--r-- | src/core/entity.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/core/entity.cc b/src/core/entity.cc index 35164dc..013e66d 100644 --- a/src/core/entity.cc +++ b/src/core/entity.cc @@ -266,13 +266,9 @@ void Entity::clear_updates() } } -void Entity::set_info(Info *info) +void Entity::set_info(const Info *info) { entity_info = info; - if (entity_info) { - entity_info->set_model(model()); - entity_info->set_name(name()); - } } void Entity::set_inventory(Inventory *inventory) @@ -318,10 +314,6 @@ void Entity::set_model(model::Model *model) if (entity_model) { entity_modelname.assign(entity_model->name()); } - - if (entity_info) { - entity_info->set_model(entity_model); - } } void Entity::set_modelname(const std::string &modelname) |