Merge branch 'master' into Mario/fullbright_skins

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hud / panel / score.qc

diff --git a/qcsrc/client/hud/panel/score.qc b/qcsrc/client/hud/panel/score.qc
index ce199ee683b9a128983a17e5ea98b8a0bfaa5976..b07b84ed33f8001c34779cea4a7bddd9d4db5813 100644 (file)
--- a/qcsrc/client/hud/panel/score.qc
+++ b/qcsrc/client/hud/panel/score.qc
@@ -1,11 +1,16 @@
 #include "score.qh"
+
+#include <client/scoreboard.qh>
+#include <common/ent_cs.qh>
+#include <common/mapinfo.qh>
+
 // Score (#7)
 
 void HUD_UpdatePlayerTeams();
 void HUD_Score_Rankings(vector pos, vector mySize, entity me)
 {
        float score;
-       entity tm = world, pl;
+       entity tm = NULL, pl;
        int SCOREPANEL_MAX_ENTRIES = 6;
        float SCOREPANEL_ASPECTRATIO = 2;
        int entries = bound(1, floor(SCOREPANEL_MAX_ENTRIES * mySize.y/mySize.x * SCOREPANEL_ASPECTRATIO), SCOREPANEL_MAX_ENTRIES);
@@ -139,6 +144,10 @@ void HUD_Score()
        pos = panel_pos;
        mySize = panel_size;
 
+       if (autocvar_hud_panel_score_dynamichud)
+               HUD_Scale_Enable();
+       else
+               HUD_Scale_Disable();
        HUD_Panel_DrawBg(1);
        if(panel_bg_padding)
        {
@@ -161,7 +170,7 @@ void HUD_Score()
                        pl = pl.sort_next;
                if(scores_flags[ps_primary] & SFL_ZERO_IS_WORST)
                        if(pl.scores[ps_primary] == 0)
-                               pl = world;
+                               pl = NULL;
 
                score = me.(scores[ps_primary]);
                timer = TIME_ENCODED_TOSTRING(score);