From: terencehill Date: Wed, 1 May 2013 09:37:28 +0000 (+0200) Subject: If observing force team color to red entering hud config mode X-Git-Tag: xonotic-v0.7.0~62^2~2 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=07f0e71f7ae1fcaab54f751e7320b2c13947d924 If observing force team color to red entering hud config mode --- diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index bb8a646de..1b2be1154 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -4416,7 +4416,10 @@ void HUD_Main (void) vector color; float hud_dock_color_team = autocvar_hud_dock_color_team; if((teamplay) && hud_dock_color_team) { - color = colormapPaletteColor(myteam, 1) * hud_dock_color_team; + if(autocvar__hud_configure && myteam == NUM_SPECTATOR) + color = '1 0 0' * hud_dock_color_team; + else + color = colormapPaletteColor(myteam, 1) * hud_dock_color_team; } else if(autocvar_hud_configure_teamcolorforced && autocvar__hud_configure && hud_dock_color_team) { color = '1 0 0' * hud_dock_color_team; diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh index e2dd7ea82..ef94976dc 100644 --- a/qcsrc/client/hud.qh +++ b/qcsrc/client/hud.qh @@ -186,7 +186,10 @@ if(!autocvar__hud_configure && panel_bg_str == "0") {\ // Get value for panel_bg_color: if "" fetch default, else use panel_bg_color. Convert pants, shirt or teamcolor into a vector. #define HUD_Panel_GetColor()\ if((teamplay) && panel_bg_color_team) {\ - panel_bg_color = colormapPaletteColor(myteam, 1) * panel_bg_color_team;\ + if(autocvar__hud_configure && myteam == NUM_SPECTATOR)\ + panel_bg_color = '1 0 0' * panel_bg_color_team;\ + else\ + panel_bg_color = colormapPaletteColor(myteam, 1) * panel_bg_color_team;\ } else if (autocvar_hud_configure_teamcolorforced && autocvar__hud_configure && panel_bg_color_team) {\ panel_bg_color = '1 0 0' * panel_bg_color_team;\ } else {\