]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Move show specs position so it isn't between warmup and F4 message, also give player...
authorMario <mario@smbclan.net>
Tue, 26 Jul 2016 09:39:51 +0000 (19:39 +1000)
committerMario <mario@smbclan.net>
Tue, 26 Jul 2016 09:39:51 +0000 (19:39 +1000)
qcsrc/client/hud/panel/infomessages.qc

index fe16ef14798e772e886f6a3bfde00a16457a2b53..2df27e715aba8876e42266f6a56a6501c34d0b93 100644 (file)
@@ -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
        {