summaryrefslogtreecommitdiff
path: root/src/game/g_combat.c
diff options
context:
space:
mode:
authorChristopher Schwarz <lakitu7@gmail.com>2011-02-13 04:45:27 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:17:59 +0000
commitf8a3affa56ffb27759684a8cdd74c9a8c672a88a (patch)
tree54ef49879f31196b911bd3cb70725fd0b120ed4f /src/game/g_combat.c
parentc3fab7ec93512ff4b4ebf02f7d3ffa494c215b14 (diff)
* Prevent players from being poisoned by explosions of buildables that were killed by players with poison (Thanks The Medistation for reporting)
Diffstat (limited to 'src/game/g_combat.c')
-rw-r--r--src/game/g_combat.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/g_combat.c b/src/game/g_combat.c
index 58ec2683..29b635dd 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -1117,8 +1117,8 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
{
if( targ->client->ps.stats[ STAT_TEAM ] == TEAM_HUMANS &&
mod != MOD_LEVEL2_ZAP && mod != MOD_POISON &&
- mod != MOD_LEVEL1_PCLOUD &&
- targ->client->poisonImmunityTime < level.time )
+ mod != MOD_LEVEL1_PCLOUD && mod != MOD_HSPAWN &&
+ mod != MOD_ASPAWN && targ->client->poisonImmunityTime < level.time )
{
targ->client->ps.stats[ STAT_STATE ] |= SS_POISONED;
targ->client->lastPoisonTime = level.time;