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>2013-11-05 13:17:27 +0000
committerStijn Buys <ingar@osirion.org>2013-11-05 13:17:27 +0000
commit9a16c4b433bba4837bc98a90b446aa0726f0d447 (patch)
tree162f257f40a83ae46eddbe1fa0289b2d3e496e44 /src/game/base/ship.h
parentcbb34af067be07ad28349e64d8670c97785c53c0 (diff)
Correct a bug where launch timeout is ignored for patrols with only a single member,
increase dampening for cargo pods, added 'explode' cheat function to self-destruct, cleaned up cargo pod eject code, eject cargo on ship destruction, added g_cargoloss game variable.
Diffstat (limited to 'src/game/base/ship.h')
-rw-r--r--src/game/base/ship.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/game/base/ship.h b/src/game/base/ship.h
index fa6e60d..e8a6505 100644
--- a/src/game/base/ship.h
+++ b/src/game/base/ship.h
@@ -214,6 +214,13 @@ public:
void launch();
void set_spawn(core::Entity *spawn);
+
+ /**
+ * @brief eject an item from inventory
+ * Ejecting an item while the ship is docked will destroy it,
+ * otherwise it will create a cargo pod
+ * */
+ void eject(core::Item *item, const long eject_amount, const bool eject_message);
protected:
/**