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>2009-07-07 13:43:05 +0000
committerStijn Buys <ingar@osirion.org>2009-07-07 13:43:05 +0000
commit7e15b99c01616999496155fe5d2ce89d7608932b (patch)
tree226d5c23b0a931ccbbf490aaf2da647ed6ebe5d4 /src/game/base/ship.h
parent1f71cc5e127f6163e9163afd42453fe145defbeb (diff)
Initial bullet physics support
Diffstat (limited to 'src/game/base/ship.h')
-rw-r--r--src/game/base/ship.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/game/base/ship.h b/src/game/base/ship.h
index 37f8b88..21987e7 100644
--- a/src/game/base/ship.h
+++ b/src/game/base/ship.h
@@ -9,6 +9,7 @@
#include "core/player.h"
#include "core/entity.h"
+#include "base/physics.h"
#include "base/shipmodel.h"
#include "base/jumppoint.h"
#include "math/vector3f.h"
@@ -16,7 +17,7 @@
namespace game {
/// A ship in the game, controled by a player
-class Ship : public core::EntityControlable
+class Ship : public core::EntityControlable, public PhysicsBody
{
public:
Ship(core::Player *owner, ShipModel *shipmodel);
@@ -25,6 +26,9 @@ public:
/// update the ship state
virtual void frame(float seconds);
+ /// move the ship to a different zone
+ virtual void set_zone(core::Zone *zone);
+
/// true if the ship is equiped with a jumpdrive
inline bool jumpdrive() const { return ship_jumpdrive; }