summaryrefslogtreecommitdiff
path: root/src/game/g_utils.c
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2001-02-15 03:05:07 +0000
committerTim Angus <tim@ngus.net>2001-02-15 03:05:07 +0000
commitf88246392e865202dd2b7029c0f3b62c7eb4c0f8 (patch)
tree01557e2e113d0521225c6e27ec5c98d7f458b968 /src/game/g_utils.c
parent31f1bb33ab5d7d3e6ebbc7eee88452e6efc8b011 (diff)
Infesting getting fairly polished. Usual random bugfixes.
Diffstat (limited to 'src/game/g_utils.c')
-rw-r--r--src/game/g_utils.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/game/g_utils.c b/src/game/g_utils.c
index dc960ab0..a72f57ad 100644
--- a/src/game/g_utils.c
+++ b/src/game/g_utils.c
@@ -540,10 +540,13 @@ void G_KillBox (gentity_t *ent) {
for (i=0 ; i<num ; i++) {
hit = &g_entities[touch[i]];
- if ( !hit->client ) {
+ if ( !hit->client )
continue;
- }
+ //TA: impossible to telefrag self
+ if( ent == hit )
+ continue;
+
// nail it
G_Damage ( hit, ent, ent, NULL, NULL,
100000, DAMAGE_NO_PROTECTION, MOD_TELEFRAG);