Don't draw team 0 if teamplay is active (potential fix for the infamous 'black team...

diff --git a/qcsrc/client/hud/panel/score.qc b/qcsrc/client/hud/panel/score.qc
index d120c1cd181d75cc400a4cf8f57a201fa3607c11..42d18ff62a92ef0876e70f6c1e08cb699aee1d73 100644 (file)
--- a/qcsrc/client/hud/panel/score.qc
+++ b/qcsrc/client/hud/panel/score.qc
@@ -74,6 +74,8 @@ void HUD_Score_Rankings(vector pos, vector mySize, entity me)
                for(tm = teams.sort_next; tm; tm = tm.sort_next) {
                        if(tm.team == NUM_SPECTATOR)
                                continue;
+                       if(!tm.team && teamplay)
+                               continue;
                        if (tm.team == myteam)
                                drawfill(pos + eX * score_size * i, eX * score_size + eY * fontsize.y, '1 1 1', highlight_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
                        drawstring_aspect(pos + eX * score_size * i, ftos(tm.(teamscores[ts_primary])), eX * score_size + eY * fontsize.y, Team_ColorRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
@@ -269,6 +271,8 @@ void HUD_Score()
                for(tm = teams.sort_next; tm; tm = tm.sort_next) {
                        if(tm.team == NUM_SPECTATOR)
                                continue;
+                       if(!tm.team && teamplay)
+                               continue;
                        score = tm.(teamscores[ts_primary]);
                        if(autocvar__hud_configure)
                                score = 123;

diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index 44b820ebc7a7acadb5faebe2da7265136193e630..cd8df72f66cfa7f2699645d76a8f824f7aa80687 100644 (file)
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -1313,6 +1313,8 @@ void HUD_DrawScoreboard()
                {
                        if(tm.team == NUM_SPECTATOR)
                                continue;
+                       if(!tm.team && teamplay)
+                               continue;
 
                        draw_beginBoldFont();
                        rgb = Team_ColorRGB(tm.team);
@@ -1342,6 +1344,8 @@ void HUD_DrawScoreboard()
                {
                        if(tm.team == NUM_SPECTATOR)
                                continue;
+                       if(!tm.team && teamplay)
+                               continue;
 
                        pos = HUD_Scoreboard_MakeTable(pos, tm, rgb, bg_size);
                }