diff options
author | Stijn Buys <ingar@osirion.org> | 2008-07-30 16:00:49 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2008-07-30 16:00:49 +0000 |
commit | d09a1be33a647aedc12ce5ddcb7ea4ee23a75c8c (patch) | |
tree | 8fe9d8778223e22e8c957b59c51bccabb98d2b94 /src/game/ship.cc | |
parent | ad436de3a520fb2469dafe23afe03dd0afe8d189 (diff) |
various minor issues: ESC closing chat, g_autolevel
Diffstat (limited to 'src/game/ship.cc')
-rw-r--r-- | src/game/ship.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/ship.cc b/src/game/ship.cc index d8f7bb3..aa47044 100644 --- a/src/game/ship.cc +++ b/src/game/ship.cc @@ -64,7 +64,7 @@ void Ship::frame(float seconds) entity_thrust = target_thrust; - if (autolevel()) { + if (autolevel() && Game::instance()->g_autolevel->value()) { n.assign(math::crossproduct(entity_axis.up(), math::Vector3f(0, 0, 1.0f))); if (!(n.length() < MIN_DELTA)) { cosangle = math::dotproduct(entity_axis.up(), math::Vector3f(0, 0, 1.0f)); @@ -96,7 +96,7 @@ void Ship::frame(float seconds) } // auto-leveling - if (autolevel()) { + if (autolevel() && Game::instance()->g_autolevel->value()) { n.assign(math::crossproduct(entity_axis.up(), math::Vector3f(0.0f, 0.0f, 1.0f))); if (!(n.length() < MIN_DELTA)) { cosangle = math::dotproduct(entity_axis.up(), math::Vector3f(0.0f, 0.0f, 1.0f)); |