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/ship.h')
-rw-r--r--src/game/ship.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/ship.h b/src/game/ship.h
index d420f67..f83c41e 100644
--- a/src/game/ship.h
+++ b/src/game/ship.h
@@ -8,11 +8,12 @@
#define __INCLUDED_GAME_SHIP_H__
// project headers
+#include "core/entity.h"
#include "math/vector3f.h"
namespace game {
-class Ship
+class Ship : public core::Entity
{
public:
Ship();
@@ -21,8 +22,6 @@ public:
/// update the ship state
void update(float elapsed);
- /// location of the ship in space
- math::Vector3f location;
/// speed vector in units/second
float speed;
@@ -44,6 +43,7 @@ public:
/// yaw turn speed
float yaw_speed;
+ static const unsigned int type_id=1;
private:
/// current yaw, angle in XZ plane, 0-360
float yaw_current;