Fix and finalize my last code

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index f5094fa4ed14eca271ee49f48f22f64882ac1967..39d69ae0cbca53777e4cd29a449876600bb12e81 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -1139,9 +1139,9 @@ seta sbar_scoreboard_fadeoutspeed 5 "speed at which scoreboard fades out, higher
 seta sbar_scoreboard_highlight 1 "enable highlighting for rows and columns in the scoreboard"\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.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_color1 "0 0.5 0" "RGB color of the stomach board indicators when showing self"\r
+seta sbar_stomachboard_color2 "0.5 0.5 0" "RGB color of the stomach board indicators when showing team mate predators"\r
+seta sbar_stomachboard_color3 "0.5 0 0" "RGB color of the stomach board indicators when showing enemy 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

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index c9d1d4f1226d88664ef8d19312ba56c471c638b9..527872bcdef423d7a959192a835d1673073849cf 100644 (file)
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -930,9 +930,12 @@ void Sbar_PrintStomachboardItem(vector pos, entity pl)
                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
+                       {\r
+                               if(teamplay && GetPlayerColor(pl.entnum - 1) == GetPlayerColor(player_localentnum - 1)) // same team\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_color3")), cvar("sbar_stomachboard_highlight_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+                       }\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
                }\r
@@ -2927,7 +2930,10 @@ void Sbar_Draw (void)
 \r
                        if(getstati(STAT_VORE_EATEN))\r
                        {\r
-                               drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', StomachStatus_ColorFade(stov(cvar_string("sbar_stomachboard_color2"))), cvar("sbar_stomachboard_status_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+                               if(teamplay && GetPlayerColor(getstati(STAT_VORE_EATEN) - 1) == GetPlayerColor(player_localentnum - 1)) // same team\r
+                                       drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', StomachStatus_ColorFade(stov(cvar_string("sbar_stomachboard_color2"))), cvar("sbar_stomachboard_status_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+                               else\r
+                                       drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', StomachStatus_ColorFade(stov(cvar_string("sbar_stomachboard_color3"))), cvar("sbar_stomachboard_status_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                                drawstring(bottomleft - '-80 173 0', "predator:", '11 11 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                        }\r
                        else\r