From f55bf69a42e557687e1810b3134da38602ab3cb8 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Sat, 22 Apr 2006 22:42:45 +0000 Subject: * Do not increase team kills when team killing (from tjw) --- src/game/g_combat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/g_combat.c b/src/game/g_combat.c index d9668296..f457b77e 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -238,7 +238,7 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int totalDamage += (float)self->credits[ i ]; // if players did more than DAMAGE_FRACTION_FOR_KILL increment the stage counters - if( totalDamage >= ( self->client->ps.stats[ STAT_MAX_HEALTH ] * DAMAGE_FRACTION_FOR_KILL ) ) + if( !OnSameTeam( self, attacker ) && totalDamage >= ( self->client->ps.stats[ STAT_MAX_HEALTH ] * DAMAGE_FRACTION_FOR_KILL ) ) { if( self->client->ps.stats[ STAT_PTEAM ] == PTE_HUMANS ) trap_Cvar_Set( "g_alienKills", va( "%d", g_alienKills.integer + 1 ) ); -- cgit