From 60d293cb51ae70c020c7e047ab0390d84357615d Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Sat, 9 Feb 2002 23:44:04 +0000
Subject: Poison works now

---
 src/game/g_combat.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/game/g_combat.c b/src/game/g_combat.c
index fbb13547..de6a3950 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -1143,21 +1143,14 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
       VectorCopy ( targ->r.currentOrigin, client->damage_from );
       client->damage_fromWorld = qtrue;
     }
-  }
-
-  // See if it's the player hurting the emeny flag carrier
-  if( g_gametype.integer == GT_CTF)
-    Team_CheckHurtCarrier(targ, attacker);
 
-  if( targ->client )
-  {
     // set the last client who damaged the target
     targ->client->lasthurt_client = attacker->s.number;
     targ->client->lasthurt_mod = mod;
     take = (int)( (float)take * G_CalcDamageModifier( point, targ, attacker, client->ps.stats[ STAT_PCLASS ] ) );
 
     //if boosted poison every attack
-    if( client && client->ps.stats[ STAT_STATE ] & SS_BOOSTED )
+    if( attacker->client && attacker->client->ps.stats[ STAT_STATE ] & SS_BOOSTED )
     {
       if( !( targ->client->ps.stats[ STAT_STATE ] & SS_POISONED ) )
       {
-- 
cgit