r3869 - in trunk/data/qcsrc: client server

[DONOTREPLY at icculus.org]

Author: blub0
Date: 2008-07-21 11:47:18 -0400 (Mon, 21 Jul 2008)
New Revision: 3869

Modified:
   trunk/data/qcsrc/client/mapvoting.qc
   trunk/data/qcsrc/server/g_world.qc
Log:
I suck today...

Modified: trunk/data/qcsrc/client/mapvoting.qc
===================================================================
--- trunk/data/qcsrc/client/mapvoting.qc	2008-07-21 14:44:04 UTC (rev 3868)
+++ trunk/data/qcsrc/client/mapvoting.qc	2008-07-21 15:47:18 UTC (rev 3869)
@@ -145,7 +145,7 @@
 	
 	isize = (ymax - pos_y - mv_num_maps*10) / mv_num_maps;
 	isize = min(isize, 64);
-	for(i = 0; i < (mv_num_maps - mv_abstain); ++i) // - mv_abstain safe? make sure it's 0 or 1
+	for(i = 0; i < (mv_num_maps - mv_abstain); ++i)
 	{
 		tmp = mv_votes[i]; // FTEQCC bug: too many array accesses in the function call screw it up
 		if(tmp < 0)

Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2008-07-21 14:44:04 UTC (rev 3868)
+++ trunk/data/qcsrc/server/g_world.qc	2008-07-21 15:47:18 UTC (rev 3869)
@@ -2099,6 +2099,7 @@
   	WriteByte(targ, mapvote_count);
   	WriteByte(targ, mapvote_abstain);
   	WriteByte(targ, mapvote_detail);
+	WriteByte(targ, mapvote_timeout - time);
  	if(mapvote_count <= 8)
  		WriteByte(targ, MapVote_GetMapMask());
  	else