r3966 - trunk/data/qcsrc/client

[DONOTREPLY at icculus.org]

Author: blub0
Date: 2008-07-28 15:01:09 -0400 (Mon, 28 Jul 2008)
New Revision: 3966

Modified:
   trunk/data/qcsrc/client/mapvoting.qc
Log:
move abstain vote to the center and fix size calc for evilish odd numbers of votable maps :P

Modified: trunk/data/qcsrc/client/mapvoting.qc
===================================================================
--- trunk/data/qcsrc/client/mapvoting.qc	2008-07-28 18:54:06 UTC (rev 3965)
+++ trunk/data/qcsrc/client/mapvoting.qc	2008-07-28 19:01:09 UTC (rev 3966)
@@ -158,10 +158,12 @@
 	
 	// base for multi-column stuff...
 	ymin = pos_y;
+	if(mv_abstain)
+		mv_num_maps -= 1;
+	
 	if(mv_num_maps > 5)
 	{
-		//xmax = 0.5*(xmax - xmin);
-		isize = (ymax - pos_y - mv_num_maps*10) / floor(0.5*mv_num_maps); // or ceil?
+		isize = (ymax - pos_y - mv_num_maps*10) / ceil(0.5*mv_num_maps);
 		pos_x = xmin + 0.25*(xmax-xmin);
 	} else {
 		isize = (ymax - pos_y - mv_num_maps*10) / mv_num_maps;
@@ -169,10 +171,10 @@
 	}
 
 	ymax -= isize;
-	for(i = 0; i < (mv_num_maps - mv_abstain); ++i)
+	for(i = 0; i < mv_num_maps; ++i)
 	{
 		// base for multi-column stuff
-		if(pos_y >= ymax)
+		if(pos_y > ymax)
 		{
 			pos_y = ymin;
 			pos_x = xmin + 0.75*(xmax-xmin);
@@ -193,8 +195,14 @@
 			MapVote_DrawMapNotAvailable(pos, isize, map, tmp, i);
 		pos_y += isize + 10;
 	}
+
+	if(mv_abstain)
+		mv_num_maps++;
+	
 	if(mv_abstain && i < mv_num_maps) {
 		tmp = mv_votes[i];
+		pos_y = ymax + isize - sbar_fontsize_y;
+		pos_x = (xmax+xmin)*0.5;
 		MapVote_DrawAbstain(pos, isize, tmp, i);
 	}
 }