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/shipmodel.cc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src/game/base/shipmodel.cc') diff --git a/src/game/base/shipmodel.cc b/src/game/base/shipmodel.cc index 4d5db69..126557c 100644 --- a/src/game/base/shipmodel.cc +++ b/src/game/base/shipmodel.cc @@ -116,6 +116,20 @@ bool ShipModel::init() } else if (inifile.got_key_float("radius", f)) { shipmodel->set_radius(f); continue; + } else if (inifile.got_key_string("damping", str)) { + float linear, angular; + std::istringstream sstr("str"); + if (sstr >> linear) { + if (sstr >> angular) { + shipmodel->set_linear_damping(linear); + shipmodel->set_angular_damping(angular); + } else { + shipmodel->set_linear_damping(linear); + shipmodel->set_angular_damping(linear); + } + } else { + inifile.unknown_value(); + } } else if (inifile.got_key_label("template", str)) { Template *entitytemplate = Template::find(str); if (!entitytemplate) { @@ -184,6 +198,8 @@ ShipModel::ShipModel() : core::Info(shipmodel_infotype) //default specifications shipmodel_radius = 0.0f; shipmodel_mass = 0.0f; + shipmodel_linear_damping = 0.8f; + shipmodel_angular_damping = 0.8f; shipmodel_thrust_force = 0.8f; shipmodel_impulse_force = 4.0f; -- cgit v1.2.3