diff options
author | Stijn Buys <ingar@osirion.org> | 2010-11-24 20:13:56 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2010-11-24 20:13:56 +0000 |
commit | 9623feb8667b9aa5a47343a13d5b9acb2312cbf8 (patch) | |
tree | 1c8062e3086d661a737008b73f9e83eb1324f8b4 /src/game/base/ship.cc | |
parent | 808b21fc5fc33cf426fe459c7334d8101baafa0a (diff) |
Exposed ship physics damping factors through ships.ini and the specs command.
Diffstat (limited to 'src/game/base/ship.cc')
-rw-r--r-- | src/game/base/ship.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/game/base/ship.cc b/src/game/base/ship.cc index 40b7812..86a467b 100644 --- a/src/game/base/ship.cc +++ b/src/game/base/ship.cc @@ -92,9 +92,7 @@ Ship::Ship(core::Player *owner, const ShipModel *shipmodel) : core::EntityContro // initialize physics reset(); - const float linear_damp = 0.8f; - const float angular_damp = 0.8f; - body()->setDamping(linear_damp, angular_damp); + body()->setDamping(ship_shipmodel->linear_damping(), ship_shipmodel->angular_damping()); } Ship::~Ship() @@ -370,7 +368,6 @@ void Ship::frame(float seconds) math::Vector3f n; // normal of a plane math::Axis target_axis(axis()); // target axis - entity_movement = 0; /* -- update state ----------------------------------------- */ |