summaryrefslogtreecommitdiff
path: root/src/game/g_buildable.c
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2003-02-23 19:16:36 +0000
committerTim Angus <tim@ngus.net>2003-02-23 19:16:36 +0000
commit63b76c006f1ae19cc68dece317ccbdd6def2549e (patch)
tree37d15801a4ca355cb017a3abeb7d11c3b5300a53 /src/game/g_buildable.c
parent15bd652f76560d93e8c5516d59180872cba05bb0 (diff)
* Fixed mutually recursive mine loop
Diffstat (limited to 'src/game/g_buildable.c')
-rw-r--r--src/game/g_buildable.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c
index f64d7307..2881982b 100644
--- a/src/game/g_buildable.c
+++ b/src/game/g_buildable.c
@@ -1314,6 +1314,9 @@ void HFM_Touch( gentity_t *self, gentity_t *other, trace_t *trace )
if( self->health <= 0 )
return;
+ if( other && other->client && other->client->ps.stats[ STAT_PTEAM ] == PTE_HUMANS )
+ return;
+
//go boom
G_Damage( self, NULL, NULL, NULL, NULL, 10000, 0, MOD_SUICIDE );
}
@@ -1333,6 +1336,8 @@ void HFM_Die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int da
dir[ 0 ] = dir[ 1 ] = 0;
dir[ 2 ] = -1;
+ self->takedamage = qfalse;
+
//do a bit of radius damage
G_RadiusDamage( self->s.pos.trBase, self->parent, self->splashDamage,
self->splashRadius, self, self->splashMethodOfDeath );