From 246d953e04e1adedbf3e75e8a250a26e5ddd84ca Mon Sep 17 00:00:00 2001 From: terencehill Date: Fri, 5 Nov 2010 00:19:24 +0100 Subject: [PATCH] Replace autocvar_hud_dock_* --- qcsrc/client/autocvars.qh | 3 --- qcsrc/client/hud.qc | 33 +++++++++++++++++++-------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh index 15391637c..945b76d5f 100644 --- a/qcsrc/client/autocvars.qh +++ b/qcsrc/client/autocvars.qh @@ -27,9 +27,6 @@ var string autocvar__hud_panelorder; var string autocvar_hud_skin; var string autocvar_hud_dock; -var string autocvar_hud_dock_color; -var float autocvar_hud_dock_color_team; -var float autocvar_hud_dock_alpha; var float autocvar_hud_progressbar_alpha; diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 214d09106..ac1065ec6 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -5026,23 +5026,28 @@ void HUD_Main (void) { float f; vector color; - if((teamplay) && autocvar_hud_dock_color_team) { + float hud_dock_color_team = cvar("hud_dock_color_team"); + if((teamplay) && hud_dock_color_team) { f = stof(getplayerkey(player_localentnum - 1, "colors")); - color = colormapPaletteColor(mod(f, 16), 1) * autocvar_hud_dock_color_team; + color = colormapPaletteColor(mod(f, 16), 1) * hud_dock_color_team; } - else if(autocvar_hud_configure_teamcolorforced && autocvar__hud_configure && autocvar_hud_dock_color_team) { - color = '1 0 0' * autocvar_hud_dock_color_team; - } - else if(autocvar_hud_dock_color == "shirt") { - f = stof(getplayerkey(player_localentnum - 1, "colors")); - color = colormapPaletteColor(floor(f / 16), 0); - } - else if(autocvar_hud_dock_color == "pants") { - f = stof(getplayerkey(player_localentnum - 1, "colors")); - color = colormapPaletteColor(mod(f, 16), 1); + else if(autocvar_hud_configure_teamcolorforced && autocvar__hud_configure && hud_dock_color_team) { + color = '1 0 0' * hud_dock_color_team; } else - color = stov(autocvar_hud_dock_color); + { + string hud_dock_color = cvar_string("hud_dock_color"); + if(hud_dock_color == "shirt") { + f = stof(getplayerkey(player_localentnum - 1, "colors")); + color = colormapPaletteColor(floor(f / 16), 0); + } + else if(hud_dock_color == "pants") { + f = stof(getplayerkey(player_localentnum - 1, "colors")); + color = colormapPaletteColor(mod(f, 16), 1); + } + else + color = stov(hud_dock_color); + } string pic; pic = strcat(hud_skin_path, "/", autocvar_hud_dock); @@ -5052,7 +5057,7 @@ void HUD_Main (void) pic = "gfx/hud/default/dock_medium"; } } - drawpic('0 0 0', pic, eX * vid_conwidth + eY * vid_conheight, color, autocvar_hud_dock_alpha * hud_fade_alpha, DRAWFLAG_NORMAL); // no aspect ratio forcing on dock... + drawpic('0 0 0', pic, eX * vid_conwidth + eY * vid_conheight, color, cvar("hud_dock_alpha") * hud_fade_alpha, DRAWFLAG_NORMAL); // no aspect ratio forcing on dock... } // cache the panel order into the panel_order array -- 2.39.2