diff options
| author | Stijn Buys <ingar@osirion.org> | 2010-10-09 20:23:01 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2010-10-09 20:23:01 +0000 |
| commit | 0ecdd8bc98ba583bbee801b838d785c6f881d7df (patch) | |
| tree | 0ae456cb1254544e43de8abf8fa4dbb6afc91e79 /src/game/base/ship.h | |
| parent | e5be0871b6fed09eed40ff17201d1c7a4a990744 (diff) | |
removed physics references, transfer inventory on ship aquisition
Diffstat (limited to 'src/game/base/ship.h')
| -rw-r--r-- | src/game/base/ship.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/game/base/ship.h b/src/game/base/ship.h index f66bb66..1114df2 100644 --- a/src/game/base/ship.h +++ b/src/game/base/ship.h @@ -9,7 +9,6 @@ #include "core/player.h" #include "core/entity.h" -#include "base/physics.h" #include "base/shipmodel.h" #include "base/jumppoint.h" #include "math/vector3f.h" @@ -18,7 +17,7 @@ namespace game { /// A ship in the game, controled by a player -class Ship : public core::EntityControlable, public PhysicsBody +class Ship : public core::EntityControlable { public: Ship(core::Player *owner, ShipModel *shipmodel); |