Remove poison (needs a proper implementation)

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_damage.qc

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 5a1403f4849d9c3ce773212f3fdc6ea31e9af130..7ca31cecbb91adc8f24e61dc755bff041fc985ba 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -1127,12 +1127,10 @@ float Fire_IsBurning(entity e)
        return (time < e.fire_endtime);
 }
 
-float Fire_AddDamage(entity e, entity o, float d, float t, float dt, float ispoison)
+float Fire_AddDamage(entity e, entity o, float d, float t, float dt)
 {
        float dps;
        float maxtime, mintime, maxdamage, mindamage, maxdps, mindps, totaldamage, totaltime;
-       
-       e.poisoned = ispoison;
 
        if(IS_PLAYER(e))
        {
@@ -1262,7 +1260,6 @@ void Fire_ApplyDamage(entity e)
                o = e.fire_owner;
 
        // water and slime stop fire
-       if(!e.poisoned)
        if(e.waterlevel)
        if(e.watertype != CONTENT_LAVA)
                e.fire_endtime = 0;
@@ -1294,7 +1291,7 @@ void Fire_ApplyDamage(entity e)
                {
                        t = autocvar_g_balance_firetransfer_time * (e.fire_endtime - time);
                        d = autocvar_g_balance_firetransfer_damage * e.fire_damagepersec * t;
-                       Fire_AddDamage(other, o, d, t, DEATH_FIRE, FALSE);
+                       Fire_AddDamage(other, o, d, t, DEATH_FIRE);
                }
        }
 }
@@ -1318,7 +1315,6 @@ void fireburner_think()
        Fire_ApplyEffect(self.owner);
        if(!Fire_IsBurning(self.owner))
        {
-               self.owner.poisoned = FALSE;
                self.owner.fire_burner = world;
                remove(self);
                return;