r4419 - trunk/data/qcsrc/client

[DONOTREPLY at icculus.org]

Author: esteel
Date: 2008-09-08 15:27:38 -0400 (Mon, 08 Sep 2008)
New Revision: 4419

Modified:
   trunk/data/qcsrc/client/sbar.qc
Log:
the warmup marker shall always be visible in the upperright corner


Modified: trunk/data/qcsrc/client/sbar.qc
===================================================================
--- trunk/data/qcsrc/client/sbar.qc	2008-09-08 18:08:53 UTC (rev 4418)
+++ trunk/data/qcsrc/client/sbar.qc	2008-09-08 19:27:38 UTC (rev 4419)
@@ -934,13 +934,6 @@
 
 	pos_y += 1.5 * sbar_fontsize_y;
 	drawcolorcodedstring(pos + '0.5 0 0' * (sbwidth - sbar_fontsize_x * stringwidth(str, TRUE)), str, sbar_fontsize, 0.8, 0);
-
-	if(warmup_stage) 
-	{
-		str = "^1Currently just warmup phase";
-		pos_y += 1.5 * sbar_fontsize_y;
-		drawcolorcodedstring(pos + '0.5 0 0' * (sbwidth - sbar_fontsize_x * stringwidth(str, TRUE)), str, sbar_fontsize, 0.8, 0);
-	}
 	
 	sbar = sbar_save;
 }
@@ -1335,14 +1328,27 @@
 	float i;
 	float x, fade;
 	float stat_items, stat_weapons;
+	vector o; o = '1 0 0' * vid_conwidth;
+	string s;
 
 	sbar_fontsize = Sbar_GetFontsize();
+	
+	if(warmup_stage) 
+	{
+		s = "^7Currently just ^1warmup^7 phase";
+		dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
+		drawcolorcodedstring(
+			o - sbar_fontsize_x * '1 0 0' * stringwidth(s, TRUE),
+			s,
+			sbar_fontsize,
+			sbar_alpha_fg,
+			0
+		);
+		o += sbar_fontsize_y * '0 1 0';
+	}
 
 	if(spectatee_status)
 	{
-		string s;
-		vector o;
-		o = '1 0 0' * vid_conwidth;
 		if(spectatee_status == -1)
 			s = "^1Observing";
 		else
@@ -1410,7 +1416,7 @@
 		);
 		o += sbar_fontsize_y * '0 1 0';
 	}
-	
+		
 	//Sbar_SortFrags();
 	Sbar_UpdatePlayerTeams();
 
@@ -1606,7 +1612,7 @@
 				//   to the right!
 			}
 		
-		
+
 			if(gametype == GAME_KEYHUNT)
 			{
 				CSQC_kh_hud();