Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2013-10-16 21:41:55 +0000
committerStijn Buys <ingar@osirion.org>2013-10-16 21:41:55 +0000
commitfd3725940b7a768706d97542f15eb1a88c41e37d (patch)
treea22f62a1e08a5af7d1bcc83edd88abb388f230de
parent2bfb32c5f3cbc180835f537c81ae3713466d9fa7 (diff)
Always send an autopilot formation notification.
-rw-r--r--src/game/base/game.cc6
1 files changed, 2 insertions, 4 deletions
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