From 1a1c7f96689cd25833b03cfb6773971947388b15 Mon Sep 17 00:00:00 2001 From: terencehill Date: Wed, 13 Mar 2013 09:32:14 +0100 Subject: [PATCH] Fix for hud observer color not neutral (it optimizes code too) --- qcsrc/client/hud.qc | 3 +-- qcsrc/client/hud.qh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 82467348e..6fb317479 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -4490,8 +4490,7 @@ void HUD_Main (void) vector color; float hud_dock_color_team = autocvar_hud_dock_color_team; if((teamplay) && hud_dock_color_team) { - f = stof(getplayerkeyvalue(current_player - 1, "colors")); - color = colormapPaletteColor(mod(f, 16), 1) * hud_dock_color_team; + 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 90ece36ac..bef2079b3 100644 --- a/qcsrc/client/hud.qh +++ b/qcsrc/client/hud.qh @@ -126,7 +126,7 @@ 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(mod(stof(getplayerkeyvalue(current_player - 1, "colors")), 16), 1) * panel_bg_color_team;\ + 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 {\ -- 2.39.2