From 9623feb8667b9aa5a47343a13d5b9acb2312cbf8 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Wed, 24 Nov 2010 20:13:56 +0000 Subject: Exposed ship physics damping factors through ships.ini and the specs command. --- src/game/base/ship.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/game/base/ship.cc') 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 ----------------------------------------- */ -- cgit v1.2.3