summaryrefslogtreecommitdiff
path: root/src/game/g_combat.c
diff options
context:
space:
mode:
authorMikko Tiusanen <ams@daug.net>2014-06-02 23:22:16 +0300
committerMikko Tiusanen <ams@daug.net>2014-06-02 23:22:16 +0300
commitddf28c92d9ccf00152b75ab7551c3b655de597cf (patch)
tree8e719db5fdf876409f0ebde27ddac46e21d7522b /src/game/g_combat.c
parenta52416fa709f00d5581dc1b4722b836561a0f3fe (diff)
Tyrant flame splash no longer poisons targets.
Diffstat (limited to 'src/game/g_combat.c')
-rw-r--r--src/game/g_combat.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/g_combat.c b/src/game/g_combat.c
index f9d7f24..70803af 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -1411,7 +1411,8 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
&& mod != MOD_LEVEL1_PCLOUD
&& mod != MOD_HSPAWN
&& mod != MOD_ASPAWN
- && mod != MOD_LEVEL5_PRICKLES)
+ && mod != MOD_LEVEL5_PRICKLES
+ && mod != MOD_FLAMER_SPLASH)
poisonTime = level.time + ALIEN_POISON_TIME;
// no more zap poisen
else if( mod == MOD_LEVEL1_CLAW && ( mod != MOD_LEVEL2_ZAP || mod != MOD_LEVEL5_ZAP || mod != MOD_FLAMES ))