Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2012-10-11 19:47:30 +0000
committerStijn Buys <ingar@osirion.org>2012-10-11 19:47:30 +0000
commitb0d67843c43f50f36a92c4b8694b3df380ce50b1 (patch)
treebce9b7e4c30862a411909a96b2d7b298c9e0999f /src/game/base/shipmodel.cc
parent529e80912f5a62eba69190aadf026a6cf1e27ea4 (diff)
Moved handling of the physics reset for the Docked and Destroyed state from game tp core.
Diffstat (limited to 'src/game/base/shipmodel.cc')
-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 b7fa7b0..6e21d91 100644
--- a/src/game/base/shipmodel.cc
+++ b/src/game/base/shipmodel.cc
@@ -330,7 +330,7 @@ void ShipModel::buy(core::EntityControlable *buyer, core::Entity *seller)
ship->get_axis().assign(seller->axis());
ship->get_axis().change_direction(180.0f);
ship->set_dock(seller);
- ship->reset();
+ //ship->reset(); // reset() is done by set_dock()
// transfer inventory
for (core::Inventory::Items::iterator it = player->control()->inventory()->items().begin();