From fd3725940b7a768706d97542f15eb1a88c41e37d Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Wed, 16 Oct 2013 21:41:55 +0000
Subject: Always send an autopilot formation notification.
---
src/game/base/game.cc | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
(limited to 'src')
diff --git a/src/game/base/game.cc b/src/game/base/game.cc
index 789f2d5..438154d 100644
--- a/src/game/base/game.cc
+++ b/src/game/base/game.cc
@@ -331,10 +331,8 @@ void Game::func_target_formation(core::Player *player, core::Entity *entity)
ship->unset_autopilot_flag(Ship::AutoPilotDock);
ship->set_autopilot_flag(Ship::AutoPilotFormation);
- if (math::distance(player->control()->location(), entity->location()) > (player->control()->radius() + entity->radius() + PLANET_SAFE_DISTANCE)) {
- // TODO replace with "formation" voice
- player->send("Autopilot set to formation with " + entity->name());
- }
+ // TODO replace with "formation" voice
+ player->send("Autopilot set to formation with " + entity->name());
}
// a player sends a standard hail
--
cgit v1.2.3