r2468 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-05-03 14:46:28 -0400 (Thu, 03 May 2007)
New Revision: 2468

Modified:
   trunk/data/qcsrc/server/keyhunt.qc
Log:
scoring bug in keyhunt



Modified: trunk/data/qcsrc/server/keyhunt.qc
===================================================================
--- trunk/data/qcsrc/server/keyhunt.qc	2007-05-03 18:29:05 UTC (rev 2467)
+++ trunk/data/qcsrc/server/keyhunt.qc	2007-05-03 18:46:28 UTC (rev 2468)
@@ -562,7 +562,7 @@
 	}
 	else
 	{
-		float of, fragsleft, i, thisteam;
+		float of, fragsleft, i, j, thisteam;
 		of = cvar("g_balance_keyhunt_score_destroyed_ownfactor");
 
 		FOR_EACH_PLAYER(player)
@@ -582,16 +582,20 @@
 		fragsleft = DistributeEvenly_Get(players);
 
 		// Now distribute these among all other teams...
+		j = kh_teams - 1;
 		for(i = 0; i < kh_teams; ++i)
 		{
 			thisteam = kh_Team_ByID(i);
+			if(thisteam == teem) // bad boy, no cookie - this WILL happen
+				continue;
+
 			players = 0;
 			FOR_EACH_PLAYER(player)
 				if(player.team == thisteam)
 					++players;
 
-			DistributeEvenly_Init(fragsleft, kh_teams - i);
-			fragsleft = DistributeEvenly_Get(kh_teams - i - 1);
+			DistributeEvenly_Init(fragsleft, j);
+			fragsleft = DistributeEvenly_Get(j - 1);
 			DistributeEvenly_Init(DistributeEvenly_Get(1), players);
 
 			FOR_EACH_PLAYER(player)