Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2010-10-25 13:43:11 +0000
committerStijn Buys <ingar@osirion.org>2010-10-25 13:43:11 +0000
commit5189168482f32d8aac630cde27fc0999e70ed57b (patch)
treed96dc388274ff13d594264ed5eeb2f9cce79370d /src/game/base/shipmodel.cc
parent787002ec11bf41bba01b899c53a38830768fc260 (diff)
renamed ship torque_force to turn_force, added ship roll_force
Diffstat (limited to 'src/game/base/shipmodel.cc')
-rw-r--r--src/game/base/shipmodel.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/game/base/shipmodel.cc b/src/game/base/shipmodel.cc
index cd69c5b..2b3f9d1 100644
--- a/src/game/base/shipmodel.cc
+++ b/src/game/base/shipmodel.cc
@@ -81,8 +81,11 @@ bool ShipModel::init()
} else if (shipsini.got_key_float("strafe", f)) {
shipmodel->set_strafe_force(f);
continue;
- } else if (shipsini.got_key_float("torque", f)) {
- shipmodel->set_torque_force(f);
+ } else if (shipsini.got_key_float("turn", f)) {
+ shipmodel->set_turn_force(f);
+ continue;
+ } else if (shipsini.got_key_float("roll", f)) {
+ shipmodel->set_roll_force(f);
continue;
} else if (shipsini.got_key_float("mass", f)) {
shipmodel->set_mass(f);
@@ -129,7 +132,8 @@ ShipModel::ShipModel() : core::Info(shipmodel_infotype)
shipmodel_thrust_force = 0.8f;
shipmodel_impulse_force = 4.0f;
shipmodel_strafe_force = 0.1f;
- shipmodel_torque_force = 2.5f;
+ shipmodel_turn_force = 2.5f;
+ shipmodel_roll_force = 1.0f;
shipmodel_maxcargo = 0.0f;