r4549 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-09-29 02:51:11 -0400 (Mon, 29 Sep 2008)
New Revision: 4549

Modified:
   trunk/data/qcsrc/server/ctf.qc
Log:
fix early/late cap scoring


Modified: trunk/data/qcsrc/server/ctf.qc
===================================================================
--- trunk/data/qcsrc/server/ctf.qc	2008-09-29 06:38:45 UTC (rev 4548)
+++ trunk/data/qcsrc/server/ctf.qc	2008-09-29 06:51:11 UTC (rev 4549)
@@ -372,10 +372,12 @@
 			bprint(other.netname, "^7 picked up the ", self.netname, "\n");
 
 			float f;
-			f = (time - self.pain_finished) / cvar("g_ctf_flag_returntime");
+			f = bound(0, (self.pain_finished - time) / cvar("g_ctf_flag_returntime"), 1);
+			//print("factor is ", ftos(f), "\n");
 			f = cvar("g_ctf_flagscore_pickup_dropped_late") * (1-f)
 			  + cvar("g_ctf_flagscore_pickup_dropped_early") * f;
 			f = floor(f + 0.5);
+			//print("score is ", ftos(f), "\n");
 
 			UpdateFrags(other, f);
 			PlayerScore_Add(other, SP_CTF_PICKUPS, 1);