r4707 - trunk/data/qcsrc/client

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-10-10 09:42:00 -0400 (Fri, 10 Oct 2008)
New Revision: 4707

Modified:
   trunk/data/qcsrc/client/sbar.qc
Log:
more visible vote/warmup naggers


Modified: trunk/data/qcsrc/client/sbar.qc
===================================================================
--- trunk/data/qcsrc/client/sbar.qc	2008-10-10 13:41:56 UTC (rev 4706)
+++ trunk/data/qcsrc/client/sbar.qc	2008-10-10 13:42:00 UTC (rev 4707)
@@ -1383,15 +1383,26 @@
 			s = strcat("^1Press ^3", getcommandkey("jump", "+jump"), "^1 to join");
 		o = Sbar_DrawNoteLine(o, s);
 	}
+
+	string blinkcolor;
+	if(mod(time, 1) >= 0.5)
+		blinkcolor = "^1";
+	else
+		blinkcolor = "^3";
 		
+	if(warmup_stage)
+	{
+		s = "^2Currently in ^1warmup^2 stage!";
+		o = Sbar_DrawNoteLine(o, s);
+	}
 	if(ready_waiting)
 	{
 		if(ready_waiting_for_me)
 		{
 			if(warmup_stage) 
-				s = strcat("^2Press ^3", getcommandkey("ready", "ready"), "^2 to end warmup");
+				s = strcat(blinkcolor, "Press ^3", getcommandkey("ready", "ready"), blinkcolor, " to end warmup");
 			else
-				s = strcat("^2Press ^3", getcommandkey("ready", "ready"), "^2 once you are ready");
+				s = strcat(blinkcolor, "Press ^3", getcommandkey("ready", "ready"), blinkcolor, " once you are ready");
 		}
 		else
 		{
@@ -1402,6 +1413,11 @@
 		}
 		o = Sbar_DrawNoteLine(o, s);
 	}
+	else if(warmup_stage) 
+	{
+		s = strcat("^2Press ^3", getcommandkey("ready", "ready"), "^2 to end warmup");
+		o = Sbar_DrawNoteLine(o, s);
+	}
 	if(vote_waiting)
 	{
 		s = strcat("^2A vote has been called for ^1", vote_called_vote);
@@ -1409,13 +1425,13 @@
 
 		if(vote_waiting_for_me)
 		{
-			s = strcat("^2Press ^3", getcommandkey("vote yes", "vyes"), "^2 to accept");
+			s = strcat(blinkcolor, "Press ^3", getcommandkey("vote yes", "vyes"), blinkcolor, " to accept");
 			o = Sbar_DrawNoteLine(o, s);
 
-			s = strcat("^2Press ^3", getcommandkey("vote no", "vno"), "^2 to reject");
+			s = strcat(blinkcolor, "Press ^3", getcommandkey("vote no", "vno"), blinkcolor, " to reject");
 			o = Sbar_DrawNoteLine(o, s);
 
-			s = strcat("^2Press ^3", getcommandkey("vote abstain", "vabstain"), "^2 to abstain");
+			s = strcat(blinkcolor, "Press ^3", getcommandkey("vote abstain", "vabstain"), blinkcolor, " to abstain");
 			o = Sbar_DrawNoteLine(o, s);
 		}
 		else