diff options
author | Stijn Buys <ingar@osirion.org> | 2008-08-23 10:31:45 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2008-08-23 10:31:45 +0000 |
commit | daf84bb6292eb5bf5434889a887535ec54c21b6b (patch) | |
tree | 1674d55039da9a100bf1d2a4a8596b793b6841a8 /src/game/ship.cc | |
parent | 7668b60981dadeced3b5c8ee27c16575d59844de (diff) |
fixes for gcc 4.3.1, added g_devel
Diffstat (limited to 'src/game/ship.cc')
-rw-r--r-- | src/game/ship.cc | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/game/ship.cc b/src/game/ship.cc index 4ddd118..e46adc1 100644 --- a/src/game/ship.cc +++ b/src/game/ship.cc @@ -69,7 +69,11 @@ void Ship::impulse() } entity_eventstate = core::Entity::ImpulseInitiate; - entity_timer = 3; + if (Game::instance()->g_devel->value()) { + entity_timer = 0; + } else { + entity_timer = 10; + } ship_impulsedrive_timer = core::server()->time(); entity_dirty = true; } @@ -79,7 +83,7 @@ void Ship::impulse() void Ship::jump(std::string const &args) { - if (!jumpdrive()) { + if (!jumpdrive() && !Game::instance()->g_devel->value()) { core::server()->send(owner(), "This ship is not equiped with a hyperspace drive!"); return; @@ -124,7 +128,11 @@ void Ship::jump(std::string const &args) } entity_eventstate = core::Entity::JumpInitiate; - entity_timer = 10; + if (Game::instance()->g_devel->value()) { + entity_timer = 0; + } else { + entity_timer = 10; + } ship_jumpdrive_timer = core::server()->time(); entity_dirty = true; } |