Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2009-03-08 11:00:30 +0000
committerStijn Buys <ingar@osirion.org>2009-03-08 11:00:30 +0000
commite4618a1c7e5fb0629997d389cb941a61095490ac (patch)
treeadbebcbd3ae487bc7642d374dfc3d9a343b111d5 /src/game
parent4c53365c16362156529c7669079e31845384589f (diff)
changed camera settings for crash-view, map tweaks
Diffstat (limited to 'src/game')
-rw-r--r--src/game/base/collision.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/game/base/collision.cc b/src/game/base/collision.cc
index 3da65d1..728ad14 100644
--- a/src/game/base/collision.cc
+++ b/src/game/base/collision.cc
@@ -32,6 +32,7 @@ void Collision::distance_test(core::EntityControlable *first, core::Entity *seco
if ((first->moduletype() == ship_enttype) && (first->state() != core::Entity::Destroyed)) {
first->owner()->send_warning("^RBOOM!^N");
static_cast<Ship *>(first)->explode();
+ first->entity_speed = 0;
}
} else if (first->owner()->last_warning() + 5.0f < core::application()->time()) {
// warning zone: star corona or planet atmosphere