r3111 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-01-05 17:15:33 -0500 (Sat, 05 Jan 2008)
New Revision: 3111

Modified:
   trunk/data/qcsrc/server/g_world.qc
Log:
handle didn't vote CORRECTLY


Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2008-01-05 21:25:02 UTC (rev 3110)
+++ trunk/data/qcsrc/server/g_world.qc	2008-01-05 22:15:33 UTC (rev 3111)
@@ -1797,13 +1797,15 @@
 	result = strcat(result, ":", ftos(mapvote_votes[mappos]), "::");
 	didntvote = mapvote_voters;
 	for(i = 0; i < mapvote_count; ++i)
-		if(i != mappos)
-			if(mapvote_maps[i] != "")
+		if(mapvote_maps[i] != "")
+		{
+			didntvote -= mapvote_votes[i];
+			if(i != mappos)
 			{
 				result = strcat(result, ":", mapvote_maps[i]);
 				result = strcat(result, ":", ftos(mapvote_votes[i]));
-				didntvote -= mapvote_votes[i];
 			}
+		}
 	result = strcat(result, ":didn't vote:", ftos(didntvote));
 	
 	GameLogEcho(result, FALSE);
@@ -1888,11 +1890,11 @@
 			result = strcat(result, ":", ftos(secondPlaceVotes), "::");
 			didntvote = mapvote_voters;
 			for(i = 0; i < mapvote_count; ++i)
-			{
-				didntvote -= mapvote_votes[i];
-				if(i != firstPlace)
-					if(i != secondPlace)
-						if(mapvote_maps[i] != "")
+				if(mapvote_maps[i] != "")
+				{
+					didntvote -= mapvote_votes[i];
+					if(i != firstPlace)
+						if(i != secondPlace)
 						{
 							result = strcat(result, ":", mapvote_maps[i]);
 							result = strcat(result, ":", ftos(mapvote_votes[i]));
@@ -1902,7 +1904,7 @@
 								mapvote_maps[i] = "";
 							}
 						}
-			}
+				}
 			result = strcat(result, ":didn't vote:", ftos(didntvote));
 			GameLogEcho(result, FALSE);
 		}