Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/base/shipmodel.cc')
-rw-r--r--src/game/base/shipmodel.cc17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/game/base/shipmodel.cc b/src/game/base/shipmodel.cc
index 9133d28..077fd3e 100644
--- a/src/game/base/shipmodel.cc
+++ b/src/game/base/shipmodel.cc
@@ -235,13 +235,6 @@ void ShipModel::buy(core::EntityControlable *buyer, core::Entity *seller)
player->send("^WCan not afford transaction!");
return;
}
-
- player->add_credits(-price());
-
- // player has only ship for now
- if (player->control()) {
- player->remove_asset(player->control());
- }
Ship * ship = new Ship(player, this);
ship->set_zone(seller->zone());
@@ -257,9 +250,17 @@ void ShipModel::buy(core::EntityControlable *buyer, core::Entity *seller)
}
ship->inventory()->set_dirty();
+ // remove old ship
+ if (player->control()) {
+ player->remove_asset(player->control());
+ }
+
+ // set control to new ship
player->set_control(ship);
player->set_view(seller);
-
+
+ player->add_credits(-price());
+
// send the ship purchased message
std::stringstream msgstr;
msgstr << "^BPurchased " << aux::article(name()) << " for " << price() << " credits";