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-09 22:05:46 +0000
committerStijn Buys <ingar@osirion.org>2010-10-09 22:05:46 +0000
commit43927cc52bdd7e44d62b0e6309612558f565b70f (patch)
treea3e9ccf69d6ab03c8444b78ac53d49529a52e675 /src/game/base/ship.cc
parent0ecdd8bc98ba583bbee801b838d785c6f881d7df (diff)
fix crash introduced with inventory transfer, buywindow credits indicator,
removed impulse drive initialization delay.
Diffstat (limited to 'src/game/base/ship.cc')
-rw-r--r--src/game/base/ship.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/game/base/ship.cc b/src/game/base/ship.cc
index 696033c..a588122 100644
--- a/src/game/base/ship.cc
+++ b/src/game/base/ship.cc
@@ -416,11 +416,13 @@ void Ship::frame(float seconds)
// clamp input values
target_thrust = 0.0f;
+ target_afterburner = 0.0f;
math::clamp(target_pitch, -1.0f, 1.0f);
math::clamp(target_roll, -1.0f, 1.0f);
math::clamp(target_direction, -1.0f, 1.0f);
- math::clamp(target_afterburner, -1.0f, 1.0f);
-
+
+ actual_maxspeed = Game::g_impulsespeed->value();
+ actual_acceleration = Game::g_impulseacceleration->value();
actual_turnspeed *= 0.5;
}