From 08f0d0fb6a57f9c398bc03ed9a3cc9537a1f3e18 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Wed, 20 Oct 2010 17:38:55 +0000 Subject: docking functions cleanup, jumpgates work again --- src/game/base/jumppoint.cc | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'src/game/base/jumppoint.cc') diff --git a/src/game/base/jumppoint.cc b/src/game/base/jumppoint.cc index ae66262..283b607 100644 --- a/src/game/base/jumppoint.cc +++ b/src/game/base/jumppoint.cc @@ -105,20 +105,8 @@ void JumpGate::validate() } } -void JumpGate::dock(core::Entity *entity) +void JumpGate::func_dock(Ship *ship) { - if (entity->moduletype() != ship_enttype) - return; - - Ship * ship = static_cast(entity); - - if (math::distance(location(), ship->location()) > radius() + ship->radius()) { - if (ship->owner()) - ship->owner()->send("Jumpgate out of range"); - return; - } - - con_debug << name() << " received docking request from " << entity->name() << std::endl; if (target()) { if (activated()) { if (ship->owner()) @@ -144,7 +132,7 @@ void JumpGate::dock(core::Entity *entity) void JumpGate::activate() { - jumpgate_timer = 10.0f; + jumpgate_timer = jump_timer_delay; set_state(core::Entity::Normal); } -- cgit v1.2.3