From 01b2fd216a79749a0d801e87a44ba1b399b2a977 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Thu, 25 Mar 2004 05:19:23 +0000 Subject: * Fixed particle system infinite loop bug in trem2 * Spawns that are interfered with plats now suicide * Fixed spectator scrolling colour screwup --- src/game/g_buildable.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/game') diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c index 3ff4da9a..3cebcd08 100644 --- a/src/game/g_buildable.c +++ b/src/game/g_buildable.c @@ -588,7 +588,8 @@ void ASpawn_Think( gentity_t *self ) { if( ( ent = G_CheckSpawnPoint( self->s.origin, self->s.origin2, BA_A_SPAWN, NULL ) ) != NULL ) { - if( ent->s.eType == ET_BUILDABLE || ent->s.number == ENTITYNUM_WORLD ) + if( ent->s.eType == ET_BUILDABLE || ent->s.number == ENTITYNUM_WORLD || + ent->s.eType == ET_MOVER ) { G_Damage( self, NULL, NULL, NULL, NULL, 10000, 0, MOD_SUICIDE ); return; @@ -2090,7 +2091,8 @@ void HSpawn_Think( gentity_t *self ) { if( ( ent = G_CheckSpawnPoint( self->s.origin, self->s.origin2, BA_H_SPAWN, NULL ) ) != NULL ) { - if( ent->s.eType == ET_BUILDABLE || ent->s.number == ENTITYNUM_WORLD ) + if( ent->s.eType == ET_BUILDABLE || ent->s.number == ENTITYNUM_WORLD || + ent->s.eType == ET_MOVER ) { G_Damage( self, NULL, NULL, NULL, NULL, 10000, 0, MOD_SUICIDE ); return; -- cgit