Show the proper stomach board color on spectated players, in the case of team mates

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index 8b7269ad9d0980cb8fc55a6b92952c6862782eb5..502349807dfcfa67216e22105ad0cdeeb4e61a2d 100644 (file)
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -932,7 +932,7 @@ void Sbar_PrintStomachboardItem(vector pos, entity pl)
                {\r
                        if(getstati(STAT_VORE_EATEN))\r
                        {\r
-                               if(teamplay && GetPlayerColor(pl.entnum - 1) == GetPlayerColor(player_localentnum - 1)) // same team\r
+                               if(teamplay && (GetPlayerColor(pl.entnum - 1) == GetPlayerColor(player_localentnum - 1) || GetPlayerColor(pl.entnum - 1) == GetPlayerColor(spectatee_status - 1))) // same team\r
                                        hl_color = stov(cvar_string("sbar_stomachboard_color2"));\r
                                else\r
                                        hl_color = stov(cvar_string("sbar_stomachboard_color3"));\r
@@ -3013,7 +3013,7 @@ void Sbar_Draw (void)
                        string hl_string;\r
                        if(getstati(STAT_VORE_EATEN))\r
                        {\r
-                               if(teamplay && GetPlayerColor(getstati(STAT_VORE_EATEN) - 1) == GetPlayerColor(player_localentnum - 1)) // same team\r
+                               if(teamplay && (GetPlayerColor(getstati(STAT_VORE_EATEN) - 1) == GetPlayerColor(player_localentnum - 1) || GetPlayerColor(getstati(STAT_VORE_EATEN) - 1) == GetPlayerColor(spectatee_status - 1))) // same team\r
                                        hl_color = stov(cvar_string("sbar_stomachboard_color2"));\r
                                else\r
                                        hl_color = stov(cvar_string("sbar_stomachboard_color3"));\r

diff --git a/docs/Release notes.txt b/docs/Release notes.txt
index b71dc0f6501029934e852b35e33009ec4bd9a44f..db83831334d40cdea1363996b73a6409f2e5e773 100644 (file)
--- a/docs/Release notes.txt
+++ b/docs/Release notes.txt
@@ -252,4 +252,6 @@ Bug fixes:
 \r
 - Fix the swallow model not showing to spectators when spectating a player. Also do some other fixes to the swallow models.\r
 \r
+- Show the proper stomach board color on spectated players, in the case of team mates\r
+\r
 - Disable GLSL color control by default. This MIGHT fix the white screen problem some people have been reporting.\r