Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2011-07-12 11:17:54 +0000
committerStijn Buys <ingar@osirion.org>2011-07-12 11:17:54 +0000
commit0e195240e5793c4bc71a694368122bc21660a21d (patch)
treead40877f9a333e2fcfc1e1dbb98fe8b7fce088f3 /src
parent59a96329f88cc4c3a3abfd2c996d83c058231690 (diff)
Corrected a segfault when launching in a newly purchased ship
Diffstat (limited to 'src')
-rw-r--r--src/game/base/shipmodel.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/base/shipmodel.cc b/src/game/base/shipmodel.cc
index 25c2268..85efcc1 100644
--- a/src/game/base/shipmodel.cc
+++ b/src/game/base/shipmodel.cc
@@ -329,9 +329,9 @@ void ShipModel::buy(core::EntityControlable *buyer, core::Entity *seller)
Ship * ship = new Ship(player, this);
ship->set_zone(seller->zone());
ship->get_location().assign(seller->location());
- ship->set_state(core::Entity::Docked);
ship->get_axis().assign(seller->axis());
ship->get_axis().change_direction(180.0f);
+ ship->set_dock(seller);
ship->reset();
// transfer inventory