[nexuiz-commits] r8261 - trunk/data/qcsrc/client

[DONOTREPLY at icculus.org]

Author: fruitiex
Date: 2009-11-09 02:30:08 -0500 (Mon, 09 Nov 2009)
New Revision: 8261

Modified:
   trunk/data/qcsrc/client/sbar.qc
Log:
flip column/row highligthing, remove the blinking text from warmup (accuracy panel)


Modified: trunk/data/qcsrc/client/sbar.qc
===================================================================
--- trunk/data/qcsrc/client/sbar.qc	2009-11-09 07:25:55 UTC (rev 8260)
+++ trunk/data/qcsrc/client/sbar.qc	2009-11-09 07:30:08 UTC (rev 8261)
@@ -1145,10 +1145,6 @@
 
 	if(warmup_stage)
 	{
-		pos_y += 40;
-		if(mod(time, 1) >= 0.4)
-			drawstringcenter(pos, "Stats are not tracked during warmup stage", sbar_fontsize, '1 1 0', sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-
 		return pos;
 	}
 
@@ -1161,13 +1157,6 @@
 	drawpic_tiled(pos, "gfx/hud/sb_scoreboard_bg", bg_size, tmp, rgb * sbar_color_bg_team, sbar_scoreboard_alpha_bg, DRAWFLAG_NORMAL);
 	drawborderlines(sbar_accuracy_border_thickness, pos, tmp, '0 0 0', sbar_scoreboard_alpha_bg * 0.75, DRAWFLAG_NORMAL);
 
-	// row highlighting
-	for(i = 0; i < rows; ++i)
-	{
-		drawfill(pos + '0 1 0' * height * (2/3) + '0 1 0' * height * i, '1 0 0' * sbwidth + '0 1 0' * fontsize, '1 1 1', sbar_scoreboard_highlight_alpha, DRAWFLAG_NORMAL);
-		
-	}
-
 	// column highlighting
 	for(i = 0; i < weapon_cnt/rows; ++i)
 	{
@@ -1175,6 +1164,12 @@
 			drawfill(pos + '1 0 0' * (sbwidth/weapon_cnt) * rows * i, '0 1 0' * height * rows + '1 0 0' * (sbwidth/weapon_cnt) * rows, '0 0 0', sbar_scoreboard_alpha_bg * 0.2, DRAWFLAG_NORMAL);
 	}
 
+	// row highlighting
+	for(i = 0; i < rows; ++i)
+	{
+		drawfill(pos + '0 1 0' * height * (2/3) + '0 1 0' * height * i, '1 0 0' * sbwidth + '0 1 0' * fontsize, '1 1 1', sbar_scoreboard_highlight_alpha, DRAWFLAG_NORMAL);	
+	}
+
 	drawfont = sbar_bigfont;
 	average_accuracy = 0;
 	float weapons_with_stats;