diff options
| author | Paweł Redman <pawel.redman@gmail.com> | 2015-06-22 16:18:38 +0200 |
|---|---|---|
| committer | Paweł Redman <pawel.redman@gmail.com> | 2015-06-22 16:18:38 +0200 |
| commit | 6aa69fe49ab81eb128471265c0329c24a27a3ae4 (patch) | |
| tree | 6a4e9b1132026db7751a988df2f935b33ddb28b3 /src/game/g_combat.c | |
| parent | ef1dd29cd38abd1f2c008bdd32ca767620613895 (diff) | |
Remove poison.
Diffstat (limited to 'src/game/g_combat.c')
| -rw-r--r-- | src/game/g_combat.c | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/src/game/g_combat.c b/src/game/g_combat.c index 52b669b..50eca22 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -1154,10 +1154,6 @@ void G_SpawnDamageIndicator( gentity_t *ent, gentity_t *inflictor, switch( mod ) { - case MOD_POISON: - di->flags |= DIF_INDIRECT | DIF_PERSISTENT; - break; - case MOD_NOCREEP: di->flags |= DIF_INDIRECT; break; @@ -1217,7 +1213,6 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, int take; int asave = 0; int knockback; - int poisonTime = 0; // int client_z, min_z; // Can't deal damage sometimes if( !targ->takedamage || targ->health <= 0 || level.intermissionQueued ) @@ -1431,39 +1426,6 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, take = (int)( take * G_CalcDamageModifier( point, targ, attacker, client->ps.stats[ STAT_CLASS ], dflags ) + 0.5f ); - - - // check possible poisoning - if( ( attacker->client ) && - ( targ->client->poisonImmunityTime < level.time ) && - ( targ->client->ps.stats[ STAT_TEAM ] == TEAM_HUMANS ) ) - { - //if boosted poison every attack - if( ( attacker->client->ps.stats[ STAT_STATE ] & SS_BOOSTED ) - - && mod != MOD_POISON - && mod != MOD_LEVEL2_ZAP - && mod != MOD_LEVEL5_ZAP - && mod != MOD_HSPAWN - && mod != MOD_ASPAWN - && mod != MOD_LEVEL5_PRICKLES - && mod != MOD_FLAMER_SPLASH) - poisonTime = level.time + ALIEN_POISON_TIME; - // no more zap poisen - else if( mod != MOD_LEVEL2_ZAP || mod != MOD_LEVEL5_ZAP || mod != MOD_FLAMES ) - { - poisonTime = level.time + g_basiUpgPoisonTime.integer * 1000; - } - if( poisonTime > 0 ) - { - targ->client->ps.stats[ STAT_STATE ] |= SS_POISONED; - if( poisonTime > targ->client->poisonExpiryTime ) { - targ->client->poisonExpiryTime = poisonTime; - targ->client->lastPoisonClient = attacker; - - } - } - } } if( take < 1 ) |