diff options
author | Stijn Buys <ingar@osirion.org> | 2011-03-08 20:02:22 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2011-03-08 20:02:22 +0000 |
commit | e897f60d10c3725638e90d0cde4a033a71215409 (patch) | |
tree | 7389bfdfe559a1859bc50b57259233b73ec93b57 /src/game/base | |
parent | ff60e4463365d274aad2c5cf8ae23a6a665b4fcd (diff) |
Restore previous thruster setting when dropping out of impulse speed.
Diffstat (limited to 'src/game/base')
-rw-r--r-- | src/game/base/ship.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/game/base/ship.cc b/src/game/base/ship.cc index 1298d05..0e4b634 100644 --- a/src/game/base/ship.cc +++ b/src/game/base/ship.cc @@ -119,8 +119,8 @@ void Ship::func_impulse() { switch (entity_state) { case core::Entity::Impulse: entity_state = core::Entity::Normal; - target_thrust = 1.0f; - entity_thrust = 0.0f; + //target_thrust = 1.0f; + //entity_thrust = 0.0f; set_dirty(); break; @@ -488,8 +488,8 @@ void Ship::frame(float seconds) } // clamp input values - target_thrust = 0.0f; - target_afterburner = 0.0f; + //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); @@ -507,11 +507,11 @@ void Ship::frame(float seconds) set_state(core::Entity::Normal); set_dirty(); entity_timer = 0; - target_thrust = 1.0f; - entity_thrust = 1.0f; + //target_thrust = 1.0f; + //entity_thrust = 1.0f; } else { - target_afterburner = 0.0f; - target_thrust = 0.0f; + //target_afterburner = 0.0f; + //target_thrust = 0.0f; } } else if (entity_state == core::Entity::Normal) { |