hopefully fix the team/pants/shirt coloring to actually use your own entnum now

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 75fc7b60f202b7c9bf4f2ea4c4a52e2369138314..c150bd66c110c8d077bdb20c02257fc9104d0b8f 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -651,7 +651,7 @@ vector HUD_Panel_GetColor(float id)
 
        // fetch per-panel color
        if(teamplay && cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_color_team")) != "") {
-               f = stof(getplayerkey(self.sv_entnum, "colors"));
+               f = stof(getplayerkey(player_localentnum - 1, "colors"));
                color = vtos(colormapPaletteColor(mod(f, 16), 1) * cvar(strcat("hud_", HUD_Panel_GetName(id), "_bg_color_team")));
        }
        else
@@ -662,24 +662,24 @@ vector HUD_Panel_GetColor(float id)
                color = cvar_string("hud_bg_color");
                color_vec = stov(color);
                if(teamplay && cvar(strcat("hud_bg_color_team"))) {
-                       f = stof(getplayerkey(self.sv_entnum, "colors"));
+                       f = stof(getplayerkey(player_localentnum - 1, "colors"));
                        color_vec = colormapPaletteColor(mod(f, 16), 1) * cvar("hud_bg_color_team");
                }
                else if(color == "shirt") {
-                       f = stof(getplayerkey(self.sv_entnum, "colors"));
+                       f = stof(getplayerkey(player_localentnum - 1, "colors"));
                        color_vec = colormapPaletteColor(floor(f / 16), 0);
                }
                else if(color == "pants") {
-                       f = stof(getplayerkey(self.sv_entnum, "colors"));
+                       f = stof(getplayerkey(player_localentnum - 1, "colors"));
                        color_vec = colormapPaletteColor(mod(f, 16), 1);
                }
        }
        else if(color == "shirt") {
-               f = stof(getplayerkey(self.sv_entnum, "colors"));
+               f = stof(getplayerkey(player_localentnum - 1, "colors"));
                color_vec = colormapPaletteColor(floor(f / 16), 0);
        }
        else if(color == "pants") {
-               f = stof(getplayerkey(self.sv_entnum, "colors"));
+               f = stof(getplayerkey(player_localentnum - 1, "colors"));
                color_vec = colormapPaletteColor(mod(f, 16), 1);
        }
        return color_vec;
@@ -693,15 +693,15 @@ vector HUD_Panel_Dock_GetColor(void)
        color = cvar_string("hud_dock_color");
        color_vec = stov(color);
        if(teamplay && cvar(strcat("hud_dock_color_team"))) {
-               f = stof(getplayerkey(self.sv_entnum, "colors"));
+               f = stof(getplayerkey(player_localentnum - 1, "colors"));
                color_vec = colormapPaletteColor(mod(f, 16), 1) * cvar("hud_dock_color_team");
        }
        else if(color == "shirt") {
-               f = stof(getplayerkey(self.sv_entnum, "colors"));
+               f = stof(getplayerkey(player_localentnum - 1, "colors"));
                color_vec = colormapPaletteColor(floor(f / 16), 0);
        }
        else if(color == "pants") {
-               f = stof(getplayerkey(self.sv_entnum, "colors"));
+               f = stof(getplayerkey(player_localentnum - 1, "colors"));
                color_vec = colormapPaletteColor(mod(f, 16), 1);
        }
        return color_vec;