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-13 15:39:23 +0000
committerStijn Buys <ingar@osirion.org>2012-10-13 15:39:23 +0000
commit1883c2ea6cb3dd4ba5f26af31a0ad481d524dfef (patch)
tree277ba1ceb22cdf8615d1631c51abc2130a90ba87 /src/game/base/ship.h
parent5dea1a263136c4cbe011de3325605dd3dc4523af (diff)
Corrected bugs in the respawn command, detect ship collisions with planets and stars.
Diffstat (limited to 'src/game/base/ship.h')
-rw-r--r--src/game/base/ship.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/game/base/ship.h b/src/game/base/ship.h
index 230d406..2670ee2 100644
--- a/src/game/base/ship.h
+++ b/src/game/base/ship.h
@@ -117,6 +117,8 @@ public:
/// reset physics state and ship controls
virtual void reset();
+
+ virtual void collision(Entity *other);
/// explode the ship
void explode();