summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristopher Schwarz <lakitu7@gmail.com>2010-05-05 22:38:27 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:17:36 +0000
commit19e6cc72ed26b6c3ddeec15cc7b7affb39bebad6 (patch)
tree912ccdadce31972076744721a76565dce1c30b23 /src
parent071b5efeda1b7fca3632c9415f4213418b4687fc (diff)
* Don't give tk/suicide penalties from exploding human buildables (thanks Oopss, Rezyn)
Diffstat (limited to 'src')
-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 a5ea3ab7..8784cd17 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -284,7 +284,7 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
{
attacker->client->lastkilled_client = self->s.number;
- if( attacker == self || OnSameTeam( self, attacker ) )
+ if( ( attacker == self || OnSameTeam( self, attacker ) ) && meansOfDeath != MOD_HSPAWN )
{
//punish team kills and suicides
if( attacker->client->ps.stats[ STAT_TEAM ] == TEAM_ALIENS )