summaryrefslogtreecommitdiff
path: root/src/game/g_combat.c
diff options
context:
space:
mode:
authorPaweł Redman <pawel.redman@gmail.com>2017-04-26 14:21:17 +0200
committerPaweł Redman <pawel.redman@gmail.com>2017-04-26 15:49:32 +0200
commit3bdef682e03faf52a4eec10af06960ec4b467af5 (patch)
tree83d5c898163c3a2d669ef8466207546b89cac5f4 /src/game/g_combat.c
parentb7a35bd780dfc454ac485afd0d75258f18549e5f (diff)
Implement g_nullifyTyrantKills.
Diffstat (limited to 'src/game/g_combat.c')
-rw-r--r--src/game/g_combat.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/game/g_combat.c b/src/game/g_combat.c
index c781959..81a5345 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -286,7 +286,9 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
}
else
{
- AddScore( attacker, 1 );
+ if( !g_nullifyTyrantKills.integer || ( meansOfDeath != MOD_LEVEL4_CHARGE && meansOfDeath != MOD_LEVEL4_CLAW &&
+ !( meansOfDeath == MOD_CHAINGUN && BG_InventoryContainsUpgrade( UP_BATTLESUIT, attacker->client->ps.stats ) ) ) )
+ AddScore( attacker, 1 );
if( g_gradualFreeFunds.integer < 2 )
attacker->client->pers.lastFreekillTime = level.time;