Merge branch 'master' into terencehill/hud_updates

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hud / hud.qh

diff --git a/qcsrc/client/hud/hud.qh b/qcsrc/client/hud/hud.qh
index d7b4585b709c05839658cdf6986461d773fb3740..5087fa526929a086937b16d0dadb3463739045a1 100644 (file)
--- a/qcsrc/client/hud/hud.qh
+++ b/qcsrc/client/hud/hud.qh
@@ -1,6 +1,6 @@
 #pragma once
 
 #pragma once
 

-#include <common/weapons/all.qh>
+#include <common/weapons/_all.qh>

 
 bool HUD_Radar_Clickable();
 void HUD_Radar_Mouse();
 
 bool HUD_Radar_Clickable();
 void HUD_Radar_Mouse();


@@ -280,9 +280,9 @@ REGISTER_HUD_PANEL(SCOREBOARD,      Scoreboard_Draw,    scoreboard,     PANEL_CO
                        panel_bg_color = autocvar_hud_panel_bg_color;                                                           \
                } else {                                                                                                    \
                        if (panel_bg_color_str == "shirt") {                                                                    \
                        panel_bg_color = autocvar_hud_panel_bg_color;                                                           \
                } else {                                                                                                    \
                        if (panel_bg_color_str == "shirt") {                                                                    \

-                               panel_bg_color = colormapPaletteColor(floor(stof(getplayerkeyvalue(current_player, "colors")) / 16), 0); \
+                               panel_bg_color = colormapPaletteColor(floor(entcs_GetClientColors(current_player) / 16), 0); \

                        } else if (panel_bg_color_str == "pants") {                                                             \
                        } else if (panel_bg_color_str == "pants") {                                                             \

-                               panel_bg_color = colormapPaletteColor(stof(getplayerkeyvalue(current_player, "colors")) % 16, 1); \
+                               panel_bg_color = colormapPaletteColor(entcs_GetClientColors(current_player) % 16, 1); \

                        } else {                                                                                                \
                                panel_bg_color = stov(panel_bg_color_str);                                                          \
                        }                                                                                                       \
                        } else {                                                                                                \
                                panel_bg_color = stov(panel_bg_color_str);                                                          \
                        }                                                                                                       \