From 63b76c006f1ae19cc68dece317ccbdd6def2549e Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Sun, 23 Feb 2003 19:16:36 +0000
Subject: * Fixed mutually recursive mine loop

---
 src/game/g_combat.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/game/g_combat.c')

diff --git a/src/game/g_combat.c b/src/game/g_combat.c
index 391c09b6..a7cf150b 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -230,7 +230,7 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
     AddScore( self, -1 );
   }
 
-  if( self->client->ps.stats[ STAT_PTEAM ] == PTE_ALIENS )
+  if( attacker && attacker->client && self->client->ps.stats[ STAT_PTEAM ] == PTE_ALIENS )
   {
     int       clientNum = attacker->client->ps.clientNum;
     float     denominator, numerator = self->credits[ clientNum ];
@@ -980,7 +980,7 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
   }
 
   // do the damage
-  if(take)
+  if( take )
   {
     targ->health = targ->health - take;
     if( targ->client )
@@ -997,7 +997,7 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
       if( client )
         targ->flags |= FL_NO_KNOCKBACK;
 
-      if (targ->health < -999)
+      if( targ->health < -999 )
         targ->health = -999;
 
       targ->enemy = attacker;
-- 
cgit