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-02-21 13:38:12 +0000
committerStijn Buys <ingar@osirion.org>2009-02-21 13:38:12 +0000
commit1a4ae6ca5cd3aac0fd639c554e824525d98676ea (patch)
tree35ae5e26fc98c60c38a4365aef45a6342039cc56 /src/game/base
parent028d9195a9a8482cff9ae4b2e3ea77d1de24b732 (diff)
sane version number,
conditional definition of missing OpenGL defines on win32, updated planet collision warning message, removed material loader debug messages
Diffstat (limited to 'src/game/base')
-rw-r--r--src/game/base/collision.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/base/collision.cc b/src/game/base/collision.cc
index 894ce95..e4a312a 100644
--- a/src/game/base/collision.cc
+++ b/src/game/base/collision.cc
@@ -37,7 +37,7 @@ void Collision::distance_test(core::EntityControlable *first, core::Entity *seco
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)) {
- first->owner()->send_warning("^3Warning: hard landing imminent!^N");
+ first->owner()->send_warning("^3Warning: entering planet gravity well!^N");
}
}
}