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/game/base/station.cc | |
parent | 417eeaa34b8374de18358cc64511d7298bc33756 (diff) |
Initial inventory loading, ships docking ships
Diffstat (limited to 'src/game/base/station.cc')
-rw-r--r-- | src/game/base/station.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/base/station.cc b/src/game/base/station.cc index fb548bb..83897cd 100644 --- a/src/game/base/station.cc +++ b/src/game/base/station.cc @@ -49,7 +49,7 @@ void Station::dock(core::Entity *entity) return; } - ship->get_location().assign(entity->location()); + ship->get_location().assign(location()); ship->set_state(core::Entity::Docked); if (ship->owner() && ship->owner()->control() == ship) { |