[nexuiz-commits] r8577 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2010-01-27 05:40:03 -0500 (Wed, 27 Jan 2010)
New Revision: 8577

Modified:
   trunk/data/qcsrc/server/g_damage.qc
Log:
fix fire owner handling

Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2010-01-27 06:30:24 UTC (rev 8576)
+++ trunk/data/qcsrc/server/g_damage.qc	2010-01-27 10:40:03 UTC (rev 8577)
@@ -1309,10 +1309,17 @@
 void Fire_ApplyDamage(entity e)
 {
 	float t, d, hi, ty;
+	entity o;
 
 	if not(Fire_IsBurning(e))
 		return;
 
+	o = e.owner;
+	while(o.owner)
+		o = o.owner;
+	if(clienttype(o) == CLIENTTYPE_NOTACLIENT)
+		o = e.fire_owner;
+
 	// water and slime stop fire
 	if(e.waterlevel)
 	if(e.watertype != CONTENT_LAVA)
@@ -1343,7 +1350,7 @@
 		{
 			t = cvar("g_balance_firetransfer_time") * (e.fire_endtime - time);
 			d = cvar("g_balance_firetransfer_damage") * e.fire_damagepersec * t;
-			Fire_AddDamage(other, e, d, t, DEATH_FIRE);
+			Fire_AddDamage(other, o, d, t, DEATH_FIRE);
 		}
 	}
 }