Merge branch 'master' into divVerent/weapons-field-rewrite

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / scoreboard.qc

diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index 05c8df88cfc68f767c1eb268bab64044dc9ef4fa..935a0277a85abdf98ce2f4d24bbbeb002eedf76e 100644 (file)
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -321,7 +321,7 @@ void Cmd_HUD_SetFields(float argc)
                else if(argv(2) == "all")
                {
                        string s;
-                       s = "ping pl color name |";
+                       s = "ping pl name |";
                        for(i = 0; i < MAX_SCORE; ++i)
                        {
                                if(i != ps_primary)
@@ -985,14 +985,14 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size)
 
        if (!acc_levels)
                rgb = '1 1 1';
-       else if (acc_col_x[0] == -1)
+       else if (acc_col[0] == '-1 0 0')
                for (i = 0; i < acc_levels; ++i)
                        acc_col[i] = stov(cvar_string(strcat("accuracy_color", ftos(i))));
 
        for(i = WEP_FIRST; i <= WEP_LAST; ++i)
        {
                self = get_weaponinfo(i);
-               if not(self.weapons)
+               if not(self.weapon)
                        continue;
                if ((i == WEP_NEX && g_minstagib) || i == WEP_PORTO || (i == WEP_MINSTANEX && !g_minstagib) || i == WEP_TUBA) // skip port-o-launch, nex || minstanex and tuba
                        continue;