summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2006-04-22 22:42:45 +0000
committerTim Angus <tim@ngus.net>2006-04-22 22:42:45 +0000
commitf55bf69a42e557687e1810b3134da38602ab3cb8 (patch)
tree491dbc7907efd4b24c4c5205074e095855e37c22
parent2964a65588e3a9ef7ca121dcc358db435a938090 (diff)
* Do not increase team kills when team killing (from tjw)
-rw-r--r--src/game/g_combat.c2
1 files changed, 1 insertions, 1 deletions
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 ) );