summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2004-10-18 17:31:16 +0000
committerTim Angus <tim@ngus.net>2004-10-18 17:31:16 +0000
commit798ec438387193c4cf928ab36b59e982b194cf7a (patch)
treecaa07805fd103c8cf5580d324cadcdcaead97105 /src
parent2c67a10f6799fa7a062f30f6310391bf60c02d5f (diff)
* Bug fixes to the bug fixes to the bug fixes to frag sharing
* p.s. It's really hard to test!
Diffstat (limited to 'src')
-rw-r--r--src/game/g_combat.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/game/g_combat.c b/src/game/g_combat.c
index 160bac49..1e962965 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -261,7 +261,10 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
{
player = g_entities + i;
- if( player->client && player->client->ps.stats[ STAT_PTEAM ] == PTE_HUMANS )
+ if( !player->client )
+ continue;
+
+ if( player->client->ps.stats[ STAT_PTEAM ] != PTE_HUMANS )
continue;
if( !self->credits[ i ] )
@@ -283,7 +286,10 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
{
player = g_entities + i;
- if( player->client && player->client->ps.stats[ STAT_PTEAM ] == PTE_ALIENS )
+ if( !player->client )
+ continue;
+
+ if( player->client->ps.stats[ STAT_PTEAM ] != PTE_ALIENS )
continue;
//this client did no damage