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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-09-24 07:28:11 -0400 (Thu, 24 Sep 2009)
New Revision: 7892

Modified:
   trunk/data/qcsrc/server/miscfunctions.qc
   trunk/data/qcsrc/server/w_common.qc
Log:
fix falloff function


Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2009-09-24 11:19:59 UTC (rev 7891)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2009-09-24 11:28:11 UTC (rev 7892)
@@ -2643,7 +2643,7 @@
 	if(halflifedist > 0)
 		return pow(0.5, (bound(mindist, d, maxdist) - mindist) / halflifedist);
 	else if(halflifedist < 0)
-		return pow(0.5, (maxdist - bound(mindist, d, maxdist)) / halflifedist);
+		return pow(0.5, (bound(mindist, d, maxdist) - maxdist) / halflifedist);
 	else
 		return 1;
 }

Modified: trunk/data/qcsrc/server/w_common.qc
===================================================================
--- trunk/data/qcsrc/server/w_common.qc	2009-09-24 11:19:59 UTC (rev 7891)
+++ trunk/data/qcsrc/server/w_common.qc	2009-09-24 11:28:11 UTC (rev 7892)
@@ -137,8 +137,8 @@
 		if(ent.team == self.team)
 			did_hit = 0;
 
-		f = ExponentialFalloff(mindist, maxdist, halflifedist, (msg_entity.origin - start) * dir);
-		ffs = ExponentialFalloff(mindist, maxdist, forcehalflifedist, (msg_entity.origin - start) * dir);
+		f = ExponentialFalloff(mindist, maxdist, halflifedist, (ent.origin - start) * dir);
+		ffs = ExponentialFalloff(mindist, maxdist, forcehalflifedist, (ent.origin - start) * dir);
 
 		// apply the damage
 		if (ent.takedamage)