Highlight team mates in a different color, in the stomach board

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index 7b5dac26089cbbacff9d991a6dee96bea0e023f5..f5094fa4ed14eca271ee49f48f22f64882ac1967 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -1140,7 +1140,8 @@ seta sbar_scoreboard_highlight 1 "enable highlighting for rows and columns in th
 seta sbar_scoreboard_highlight_alpha 0.10 "highlight alpha value (depends on sbar_scoreboard_highlight 1)"\r
 seta sbar_scoreboard_highlight_alpha_self 0.25 "self highlight alpha value"\r
 seta sbar_stomachboard_color1 "0 0.5 0" "RGB color of the stomach board indicators for self"\r
 seta sbar_scoreboard_highlight_alpha 0.10 "highlight alpha value (depends on sbar_scoreboard_highlight 1)"\r
 seta sbar_scoreboard_highlight_alpha_self 0.25 "self highlight alpha value"\r
 seta sbar_stomachboard_color1 "0 0.5 0" "RGB color of the stomach board indicators for self"\r

-seta sbar_stomachboard_color2 "0.5 0 0" "RGB color of the stomach board indicators for predator"\r
+seta sbar_stomachboard_color2 "0.5 0.5 0" "RGB color of the stomach board indicators for team mates"\r
+seta sbar_stomachboard_color3 "0.5 0 0" "RGB color of the stomach board indicators for predators"\r

 seta sbar_stomachboard_status_alpha 0.75 "alpha of the stomach board status"\r
 seta sbar_stomachboard_status_fade 1 "color fading speed of the stomach board status"\r
 seta sbar_stomachboard_highlight_alpha 0.25 "alpha of the stomach board highlight"\r
 seta sbar_stomachboard_status_alpha 0.75 "alpha of the stomach board status"\r
 seta sbar_stomachboard_status_fade 1 "color fading speed of the stomach board status"\r
 seta sbar_stomachboard_highlight_alpha 0.25 "alpha of the stomach board highlight"\r

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index d78c7789ad8e1ac17b9f55077e855ec177398107..c9d1d4f1226d88664ef8d19312ba56c471c638b9 100644 (file)
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -930,6 +930,8 @@ void Sbar_PrintStomachboardItem(vector pos, entity pl)
                if(field == ST_HIGHLIGHT)\r
                {\r
                        if(getstati(STAT_VORE_EATEN))\r
                if(field == ST_HIGHLIGHT)\r
                {\r
                        if(getstati(STAT_VORE_EATEN))\r

+                               drawfill(pos - '0 0 0', '193 11 0', stov(cvar_string("sbar_stomachboard_color3")), cvar("sbar_stomachboard_highlight_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+                       else if(pl.team == myteam)\r

                                drawfill(pos - '0 0 0', '193 11 0', stov(cvar_string("sbar_stomachboard_color2")), cvar("sbar_stomachboard_highlight_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                        else\r
                                drawfill(pos - '0 0 0', '193 11 0', stov(cvar_string("sbar_stomachboard_color1")), cvar("sbar_stomachboard_highlight_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                                drawfill(pos - '0 0 0', '193 11 0', stov(cvar_string("sbar_stomachboard_color2")), cvar("sbar_stomachboard_highlight_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                        else\r
                                drawfill(pos - '0 0 0', '193 11 0', stov(cvar_string("sbar_stomachboard_color1")), cvar("sbar_stomachboard_highlight_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);\r