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-11-25 12:06:13 +0000
committerStijn Buys <ingar@osirion.org>2012-11-25 12:06:13 +0000
commitd8be908233fd7b85492d7a9e87f07bb207173990 (patch)
tree70d9103a867688838fc517290bb370366c69fedb /src/game/base/shipmodel.cc
parentedc5ddce817244111b302e449c28a052f2746cc4 (diff)
Moved core::EntityGlobe into a separate file,
added various methods to core::Item and core::Slot, added r_slots cvar to draw entity slots and docks, added game methods for mounting and umounting of weapons, added playerlist to chat window.
Diffstat (limited to 'src/game/base/shipmodel.cc')
-rw-r--r--src/game/base/shipmodel.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/game/base/shipmodel.cc b/src/game/base/shipmodel.cc
index fe8889d..ba01765 100644
--- a/src/game/base/shipmodel.cc
+++ b/src/game/base/shipmodel.cc
@@ -337,9 +337,10 @@ void ShipModel::buy(core::EntityControlable *buyer, core::Entity *seller)
//ship->reset(); // reset() is done by set_dock()
// transfer inventory
- for (core::Inventory::Items::iterator it = player->control()->inventory()->items().begin();
- it != player->control()->inventory()->items().end(); it++) {
- ship->inventory()->add(new core::Item(*(*it)));
+ for (core::Inventory::Items::iterator it = player->control()->inventory()->items().begin(); it != player->control()->inventory()->items().end(); it++) {
+ core::Item *item = new core::Item(*(*it));
+ item->unset_flag(core::Item::Mounted);
+ ship->inventory()->add(item);
}
ship->inventory()->set_dirty();