Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/base/ship.cc')
-rw-r--r--src/game/base/ship.cc5
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 ----------------------------------------- */