From 1032161366da1b2153de8d804465061e6bcc4fce Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 17 Oct 2010 21:25:27 +0000 Subject: moved bullet objets to core::Entity, moved docking functions to game.cc and removed entity->dock(), enabled depth testing for bullet debug draw --- src/game/base/planet.cc | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'src/game/base/planet.cc') diff --git a/src/game/base/planet.cc b/src/game/base/planet.cc index 7a648db..1e280c7 100644 --- a/src/game/base/planet.cc +++ b/src/game/base/planet.cc @@ -30,27 +30,4 @@ Planet::~Planet() } -void Planet::dock(core::Entity *entity) -{ - if (entity->moduletype() != ship_enttype) - return; - - Ship * ship = static_cast(entity); - - // fixed 5 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(location()); - ship->set_state(core::Entity::Docked); - - if (ship->owner() && ship->owner()->control() == ship) { - ship->owner()->set_view(this); - ship->owner()->send("^BDocking at " + name()); - } -} - } // namespace game -- cgit v1.2.3