From a85c3ca1ff34775f2fc93013306dec21b34b0359 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Fri, 17 Sep 2010 23:05:58 +0000
Subject: Initial inventory loading, ships docking ships

---
 src/game/base/planet.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/game/base/planet.cc')

diff --git a/src/game/base/planet.cc b/src/game/base/planet.cc
index 380ca02..ca213af 100644
--- a/src/game/base/planet.cc
+++ b/src/game/base/planet.cc
@@ -49,13 +49,14 @@ void Planet::dock(core::Entity *entity)
 
 	Ship * ship = static_cast<Ship *>(entity);
 
+	// fixed 50 km docking radius
 	if (math::distance(location(), ship->location()) > radius() + ship->radius() + 50.0f) {
 		if (ship->owner())
 			ship->owner()->send("Planet out of range");
 		return;
 	}
 
-	ship->get_location().assign(entity->location());
+	ship->get_location().assign(location());
 	ship->set_state(core::Entity::Docked);
 
 	if (ship->owner() && ship->owner()->control() == ship) {
-- 
cgit v1.2.3