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>2008-03-08 14:35:58 +0000
committerStijn Buys <ingar@osirion.org>2008-03-08 14:35:58 +0000
commit343896eeaa97009fb06096dc5bcc097bf1bd287d (patch)
tree204384094ae725f1d9d33f73be867545a049e241 /src/game/ship.h
parentada8263817ed45e29d4bd63ab0ac635a83eec4f8 (diff)
added ships.ini
Diffstat (limited to 'src/game/ship.h')
-rw-r--r--src/game/ship.h14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/game/ship.h b/src/game/ship.h
index 88f42e5..633c722 100644
--- a/src/game/ship.h
+++ b/src/game/ship.h
@@ -9,6 +9,7 @@
#include "core/player.h"
#include "core/entity.h"
+#include "game/shipmodel.h"
#include "math/vector3f.h"
namespace game {
@@ -17,21 +18,14 @@ namespace game {
class Ship : public core::EntityControlable
{
public:
- Ship(core::Player *owner, std::string const & model);
+ Ship(core::Player *owner, ShipModel *shipmodel);
~Ship();
/// update the ship state
virtual void frame(float seconds);
- /* -- Ship SPECS --*/
- /// acceleration
- float acceleration;
-
- /// maximum speed
- float max_speed;
-
- /// turn speed in rotations per second
- float turn_speed;
+private:
+ ShipModel *ship_shipmodel;
};
}