docking functions cleanup, jumpgates work again

1 files changed, 2 insertions, 14 deletions

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<Ship *>(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);
 }