r5087 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-11-23 15:30:41 -0500 (Sun, 23 Nov 2008)
New Revision: 5087

Modified:
   trunk/data/qcsrc/server/cl_client.qc
Log:
yet another fix attempt for touchexplode


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2008-11-23 20:13:34 UTC (rev 5086)
+++ trunk/data/qcsrc/server/cl_client.qc	2008-11-23 20:30:41 UTC (rev 5087)
@@ -585,26 +585,19 @@
 				setcolor(self, cvar("sv_defaultplayercolors"));
 }
 
-.float touchexplode_time;
-
-void PlayerTouchExplode()
+void PlayerTouchExplode(entity p1, entity p2)
 {
-	if(self.owner.classname == "player")
-	if(self.owner.deadflag == DEAD_NO)
-	if(self.enemy.classname == "player")
-	if(self.enemy.deadflag == DEAD_NO)
-	if not(IS_INDEPENDENT_PLAYER(self.owner))
-	if not(IS_INDEPENDENT_PLAYER(self.enemy))
-	{
-		vector org;
-		org = (self.owner.origin + self.enemy.origin) * 0.5;
-		org_z += (self.owner.mins_z + self.enemy.mins_z) * 0.5;
-		setorigin(self, org);
+	vector org;
+	org = (p1.origin + p2.origin) * 0.5;
+	org_z += (p1.mins_z + p2.mins_z) * 0.5;
 
-		te_explosion(org);
-		RadiusDamage(self, world, g_touchexplode_damage, g_touchexplode_edgedamage, g_touchexplode_radius, world, g_touchexplode_force, DEATH_TOUCHEXPLODE, world);
-	}
-	remove(self);
+	te_explosion(org);
+
+	entity e;
+	e = spawn();
+	setorigin(e, org);
+	RadiusDamage(e, world, g_touchexplode_damage, g_touchexplode_edgedamage, g_touchexplode_radius, world, g_touchexplode_force, DEATH_TOUCHEXPLODE, world);
+	remove(e);
 }
 
 /*
@@ -2014,6 +2007,8 @@
 	self.flags = self.flags | FL_CLIENT | FL_NOTARGET;
 }
 
+.float touchexplode_time;
+
 /*
 =============
 PlayerPreThink
@@ -2161,6 +2156,7 @@
 			return;
 		}
 
+		if(g_touchexplode)
 		if(time > self.touchexplode_time)
 		if(self.classname == "player")
 		if(self.deadflag == DEAD_NO)
@@ -2173,14 +2169,7 @@
 			if not(IS_INDEPENDENT_PLAYER(other))
 			if(boxesoverlap(self.absmin, self.absmax, other.absmin, other.absmax))
 			{
-				entity e;
-				e = spawn();
-				e.classname = "touchexplode";
-				e.think = PlayerTouchExplode;
-				e.nextthink = time;
-				e.owner = self;
-				e.enemy = other;
-
+				PlayerTouchExplode(self, other);
 				self.touchexplode_time = other.touchexplode_time = time + 0.2;
 			}
 		}