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-02-11 00:19:11 +0000
committerStijn Buys <ingar@osirion.org>2008-02-11 00:19:11 +0000
commitafec8e7c3aec1a186512b997ed3b717efef8fc43 (patch)
tree92f19ef9144bd271c72a19a15ae32b7dcdcd994c /src/game/ship.cc
parent825d5a44bd312772c53fdaa8924e4009cfb320a3 (diff)
renamed Entity.base_* to Entity.core_*
fixed camera::mode::Overview
Diffstat (limited to 'src/game/ship.cc')
-rw-r--r--src/game/ship.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/game/ship.cc b/src/game/ship.cc
index 1ef4b9d..d6333cd 100644
--- a/src/game/ship.cc
+++ b/src/game/ship.cc
@@ -5,7 +5,7 @@
*/
// project headers
-#include "game/shared.h"
+#include "game/game.h"
#include "game/ship.h"
#include "math/mathlib.h"
@@ -17,8 +17,10 @@ using math::degrees180f;
namespace game {
-Ship::Ship() : core::Entity(0, ship_enttype)
+Ship::Ship() : core::Entity(0)
{
+ type = ship_enttype;
+
speed = 0;
yaw_current = 0;
yaw_target = yaw_current;