diff options
Diffstat (limited to 'src/game/base/jumppoint.cc')
-rw-r--r-- | src/game/base/jumppoint.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/game/base/jumppoint.cc b/src/game/base/jumppoint.cc index 80c99ef..3d9fd01 100644 --- a/src/game/base/jumppoint.cc +++ b/src/game/base/jumppoint.cc @@ -179,19 +179,17 @@ void JumpGate::func_dock(Ship *ship) void JumpGate::activate() { - jumpgate_timer = jump_timer_delay; + jumpgate_timer = jump_timer_delay * 1000; set_state(core::Entity::Normal); } -void JumpGate::frame(float elapsed) +void JumpGate::frame(const unsigned long elapsed) { - if (jumpgate_timer > 0) { + if (jumpgate_timer > elapsed) { jumpgate_timer -= elapsed; - - if (jumpgate_timer < 0) { - set_state(core::Entity::NoPower); - jumpgate_timer = 0; - } + } else if (state() != core::Entity::NoPower) { + set_state(core::Entity::NoPower); + jumpgate_timer = 0; } } |