From: Mario <mario@smbclan.net>
Date: Tue, 26 Jul 2016 09:39:51 +0000 (+1000)
Subject: Move show specs position so it isn't between warmup and F4 message, also give player... 
X-Git-Tag: xonotic-v0.8.2~750^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b5d3bff7d8bc7969453a821b5d4d18460a6dd023;p=xonotic%2Fxonotic-data.pk3dir.git

Move show specs position so it isn't between warmup and F4 message, also give player names a default white colour
---

diff --git a/qcsrc/client/hud/panel/infomessages.qc b/qcsrc/client/hud/panel/infomessages.qc
index fe16ef147..2df27e715 100644
--- a/qcsrc/client/hud/panel/infomessages.qc
+++ b/qcsrc/client/hud/panel/infomessages.qc
@@ -119,24 +119,6 @@ void HUD_InfoMessages()
 			drawInfoMessage(s);
 		}
 
-		if(autocvar_cl_showspectators)
-		if(num_spectators)
-		//if(spectatee_status != -1)
-		{
-			s = ((spectatee_status) ? _("^1Spectating this player:") : _("^1Spectating you:"));
-			//drawInfoMessage(s)
-			int limit = min(num_spectators, MAX_SPECTATORS);
-			for(int i = 0; i < limit; ++i)
-			{
-				float slot = spectatorlist[i];
-				if(i == 0)
-					s = strcat(s, " ^3", entcs_GetName(slot));
-				else
-					s = strcat("^3", entcs_GetName(slot));
-				drawInfoMessage(s);
-			}
-		}
-
 		string blinkcolor;
 		if(time % 1 >= 0.5)
 			blinkcolor = "^1";
@@ -194,6 +176,24 @@ void HUD_InfoMessages()
 				}
 			}
 		}
+
+		if(autocvar_cl_showspectators)
+		if(num_spectators)
+		//if(spectatee_status != -1)
+		{
+			s = ((spectatee_status) ? _("^1Spectating this player:") : _("^1Spectating you:"));
+			//drawInfoMessage(s)
+			int limit = min(num_spectators, MAX_SPECTATORS);
+			for(int i = 0; i < limit; ++i)
+			{
+				float slot = spectatorlist[i];
+				if(i == 0)
+					s = strcat(s, " ^7", entcs_GetName(slot));
+				else
+					s = strcat("^7", entcs_GetName(slot));
+				drawInfoMessage(s);
+			}
+		}
 	}
 	else
 	{