r3877 - in branches/nexuiz-2.0: . data/qcsrc/client

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-07-21 13:55:16 -0400 (Mon, 21 Jul 2008)
New Revision: 3877

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/client/mapvoting.qc
   branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
Log:
r3875 | blub0 | 2008-07-21 18:17:48 +0200 (Mon, 21 Jul 2008) | 1 line
fixed mapname position
r3876 | blub0 | 2008-07-21 18:39:53 +0200 (Mon, 21 Jul 2008) | 1 line
fixed teamsorting, I guess

Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2008-07-21 16:39:53 UTC (rev 3876)
+++ branches/nexuiz-2.0/.patchsets	2008-07-21 17:55:16 UTC (rev 3877)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-3873
+revisions_applied = 1-3876

Modified: branches/nexuiz-2.0/data/qcsrc/client/mapvoting.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/mapvoting.qc	2008-07-21 16:39:53 UTC (rev 3876)
+++ branches/nexuiz-2.0/data/qcsrc/client/mapvoting.qc	2008-07-21 17:55:16 UTC (rev 3877)
@@ -32,7 +32,6 @@
 	
 	drawstring(pos - '40 0', strcat(ftos(id+1), "."), img_size, rgb, 1, DRAWFLAG_NORMAL);
 
-	pos_y += img_size_y*0.5;
 	pos_x += isize/0.75 + 10;
 
 	if(mv_detail)
@@ -66,7 +65,6 @@
 	
 	drawstring(pos - '40 0', strcat(ftos(id+1), "."), img_size, rgb, 1, DRAWFLAG_NORMAL);
 	
-	pos_y += img_size_y*0.5;
 	pos_x += isize/0.75 + 10;
 
 	if(mv_detail)
@@ -92,7 +90,6 @@
 	
 	drawstring(pos - '40 0', strcat(ftos(id+1), "."), img_size, rgb, 1, DRAWFLAG_NORMAL);
 	
-	pos_y += img_size_y*0.5;
 	pos_x += isize/0.75 + 10;
 
 	if(mv_detail)
@@ -108,6 +105,7 @@
 	vector pos;
 	float isize;
 	float center;
+	float margin;
 	
 	center = (vid_conwidth - 1)/2;
 	xmin = vid_conwidth*0.2;
@@ -141,6 +139,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)
 	{
 		tmp = mv_votes[i]; // FTEQCC bug: too many array accesses in the function call screw it up

Modified: branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/sbar.qc	2008-07-21 16:39:53 UTC (rev 3876)
+++ branches/nexuiz-2.0/data/qcsrc/client/sbar.qc	2008-07-21 17:55:16 UTC (rev 3877)
@@ -316,7 +316,7 @@
 	}
 
 	other = tm.sort_next;
-	while(other && tm.sb_caps == tm.sb_caps && tm.sb_frags < other.sb_frags)
+	while(other && tm.sb_caps == other.sb_caps && tm.sb_frags < other.sb_frags)
 	{
 		SORT_SWAP(tm, other);
 		other = tm.sort_next;