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>2009-08-15 14:06:30 +0000
committerStijn Buys <ingar@osirion.org>2009-08-15 14:06:30 +0000
commit818566a1806f7b51ed8a8ecf1fb9abe0757f610e (patch)
tree7a55aa9bd93716c587f56418443c472b39198a28 /src/game/base/collision.cc
parente2934d43ab090b1e559ffc4f866aa39028d8495d (diff)
planet safe distance for launch and goto
Diffstat (limited to 'src/game/base/collision.cc')
-rw-r--r--src/game/base/collision.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/base/collision.cc b/src/game/base/collision.cc
index 215764c..4e6f4bb 100644
--- a/src/game/base/collision.cc
+++ b/src/game/base/collision.cc
@@ -6,6 +6,7 @@
#include "base/collision.h"
#include "base/game.h"
+#include "base/planet.h"
#include "core/zone.h"
#include "math/functions.h"
#include "math/vector3f.h"
@@ -39,7 +40,7 @@ void Collision::distance_test(core::EntityControlable *first, core::Entity *seco
// warning zone: star corona or planet atmosphere
if ((second->moduletype() == star_enttype) && (d-r < 50.0f)) {
first->owner()->send_warning("^3Warning: entering star corona!^N");
- } else if ((second->moduletype() == planet_enttype) && (d-r < 15.0f)) {
+ } else if ((second->moduletype() == planet_enttype) && (d-r < Planet::safe_distance)) {
first->owner()->send_warning("^3Warning: entering planet gravity well!^N");
}
}