From: MirceaKitsune Date: Sun, 17 Jul 2011 00:27:38 +0000 (+0300) Subject: Show the proper stomach board color on spectated players, in the case of team mates X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3ce032ded83c660df9da898c65b1b74926dc7d43;p=voretournament%2Fvoretournament.git 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 8b7269ad..50234980 100644 --- a/data/qcsrc/client/sbar.qc +++ b/data/qcsrc/client/sbar.qc @@ -932,7 +932,7 @@ void Sbar_PrintStomachboardItem(vector pos, entity pl) { if(getstati(STAT_VORE_EATEN)) { - if(teamplay && GetPlayerColor(pl.entnum - 1) == GetPlayerColor(player_localentnum - 1)) // same team + if(teamplay && (GetPlayerColor(pl.entnum - 1) == GetPlayerColor(player_localentnum - 1) || GetPlayerColor(pl.entnum - 1) == GetPlayerColor(spectatee_status - 1))) // same team hl_color = stov(cvar_string("sbar_stomachboard_color2")); else hl_color = stov(cvar_string("sbar_stomachboard_color3")); @@ -3013,7 +3013,7 @@ void Sbar_Draw (void) string hl_string; if(getstati(STAT_VORE_EATEN)) { - if(teamplay && GetPlayerColor(getstati(STAT_VORE_EATEN) - 1) == GetPlayerColor(player_localentnum - 1)) // same team + if(teamplay && (GetPlayerColor(getstati(STAT_VORE_EATEN) - 1) == GetPlayerColor(player_localentnum - 1) || GetPlayerColor(getstati(STAT_VORE_EATEN) - 1) == GetPlayerColor(spectatee_status - 1))) // same team hl_color = stov(cvar_string("sbar_stomachboard_color2")); else hl_color = stov(cvar_string("sbar_stomachboard_color3")); diff --git a/docs/Release notes.txt b/docs/Release notes.txt index b71dc0f6..db838313 100644 --- a/docs/Release notes.txt +++ b/docs/Release notes.txt @@ -252,4 +252,6 @@ Bug fixes: - Fix the swallow model not showing to spectators when spectating a player. Also do some other fixes to the swallow models. +- Show the proper stomach board color on spectated players, in the case of team mates + - Disable GLSL color control by default. This MIGHT fix the white screen problem some people have been reporting.