allow per-panel backgrounds, fix showonlycurrent ammo type

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 7a72c52291578d91a316e2d612f96269a93e4010..983d3d5c92db05b5cbc1e68606a89d6a5db1436c 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1327,12 +1327,14 @@ con_notifysize 10
 con_notifyalign 0
 
 // hud variables
-set _hud_configure 0
-seta hud_color "0 0.7 0.8" "color of the hud"
+set _hud_configure 0 "1 = configure the HUD"
 seta hud_accuracy_yellow 40 "percentage at which the accuracy color is yellow"
-seta hud_alpha_bg 0.8 "alpha of the background"
-seta hud_alpha_fg 1 "alpha of the foreground"
 seta hud_progressbar_alpha "0.5" "alpha of progressbars"
+seta hud_bg "border" "sets the default background for the panels, file must exist in data/gfx/hud/. 0 = disable background by default"
+seta hud_bg_color "0 0.7 0.8" "sets the default background color for the panels"
+seta hud_bg_alpha 0.8 "alpha of the background"
+seta hud_bg_border 30 "sets the default border size for the panels"
+seta hud_fg_alpha 1 "alpha of the foreground"
 
 seta sbar_info_pos 50
 
@@ -1342,36 +1344,41 @@ seta hud_showcurrentammo 0 "0 = show all ammo types, 1 = show only the ammo type
 seta hud_weaponicons 1 "enable/disable this panel"
 seta hud_weaponicons_pos "157 -55" "position of this panel"
 seta hud_weaponicons_size "175 55" "size of this panel"
-seta hud_weaponicons_bg 1 "enable/disable the background of this panel"
-seta hud_weaponicons_border 30 "size of border from the background edges""
 seta hud_weaponicons_number 1 "show number of weapon"
 seta hud_weaponicons_accuracybar_height 3 "height of accuracy bar"
-seta hud_weaponicons_color "" "optional R G B vector of the weaponicons background color, otherwise use hud default"
+seta hud_weaponicons_bg "" "if set to something else than \"\" = override default background, if set to 0 = disable background"
+seta hud_weaponicons_bg_color "" "optional R G B string of the background color, otherwise use hud default"
+seta hud_weaponicons_bg_alpha 0 "if set to something else than 0 = override default alpha"
+seta hud_weaponicons_bg_border 0 "if set to something else than 0 = override size of border around the background"
 
 seta hud_inventory 1 "enable/disable this panel"
 seta hud_inventory_pos "0 -55" "position of this panel"
 seta hud_inventory_size "150 55" "size of this panel"
-seta hud_inventory_bg 1 "enable/disable the background of this panel"
-seta hud_inventory_border 30 "size of border from the background edges"
-seta hud_inventory_color "" "optional R G B vector of the panel background color, otherwise use hud default"
+seta hud_inventory_onlycurrent 0 "1 = show only current ammo type"
+seta hud_inventory_bg "" "if set to something else than \"\" = override default background, if set to 0 = disable background"
+seta hud_inventory_bg_color "" "optional R G B string of the background color, otherwise use hud default"
+seta hud_inventory_bg_alpha 0 "if set to something else than 0 = override default alpha"
+seta hud_inventory_bg_border 0 "if set to something else than 0 = override size of border around the background"
 
 seta hud_powerups 1 "enable/disable this panel"
 seta hud_powerups_pos "-130 47.5" "position of this panel"
 seta hud_powerups_size "130 30" "size of this panel"
-seta hud_powerups_bg 1 "enable/disable the background of this panel"
-seta hud_powerups_border 30 "size of border from the background edges"
-seta hud_powerups_color "" "optional R G B vector of the panel background color, otherwise use hud default"
 seta hud_powerups_flip 1 "flip strength/shield positions"
+seta hud_powerups_bg "" "if set to something else than \"\" = override default background, if set to 0 = disable background"
+seta hud_powerups_bg_color "" "optional R G B string of the background color, otherwise use hud default"
+seta hud_powerups_bg_alpha 0 "if set to something else than 0 = override default alpha"
+seta hud_powerups_bg_border 0 "if set to something else than 0 = override size of border around the background"
 seta hud_progressbar_strength_color "0 0 0.6" "R G B vector of the progress bar background color"
 seta hud_progressbar_shield_color "0.6 0 0.6" "R G B vector of the progress bar background color"
 
 seta hud_healtharmor 1 "enable/disable this panel"
 seta hud_healtharmor_pos "0 -92.5" "position of this panel"
 seta hud_healtharmor_size "332 30" "size of this panel"
-seta hud_healtharmor_bg 1 "enable/disable the background of this panel"
-seta hud_healtharmor_border 30 "size of border from the background edges"
-seta hud_healtharmor_color "" "optional R G B vector of the panel background color, otherwise use hud default"
 seta hud_healtharmor_flip 1 "flip health/armor positions"
+seta hud_healtharmor_bg "" "if set to something else than \"\" = override default background, if set to 0 = disable background"
+seta hud_healtharmor_bg_color "" "optional R G B string of the background color, otherwise use hud default"
+seta hud_healtharmor_bg_alpha 0 "if set to something else than 0 = override default alpha"
+seta hud_healtharmor_bg_border 0 "if set to something else than 0 = override size of border around the background"
 seta hud_progressbar_health_color "0.6 0 0" "R G B vector of the progress bar background color"
 seta hud_progressbar_armor_color "0 0.6 0" "R G B vector of the progress bar background color"
 seta hud_progressbar_fuel_color "0.6 0.6 0" "R G B vector of the progress bar background color"
@@ -1379,53 +1386,60 @@ seta hud_progressbar_fuel_color "0.6 0.6 0" "R G B vector of the progress bar ba
 seta hud_notify 0 "enable/disable this panel"
 seta hud_notify_pos "-300 -37.5" "position of this base of the panel"
 seta hud_notify_size "200 37.5" "size of this panel with all notifications on"
-seta hud_notify_bg 1 "enable/disable the background of this panel"
-seta hud_notify_border 30 "size of border from the background edges"
-seta hud_notify_color "" "optional R G B vector of the panel background color, otherwise use hud default"
+seta hud_notify_bg "" "if set to something else than \"\" = override default background, if set to 0 = disable background"
+seta hud_notify_bg_color "" "optional R G B string of the background color, otherwise use hud default"
+seta hud_notify_bg_alpha 0 "if set to something else than 0 = override default alpha"
+seta hud_notify_bg_border 0 "if set to something else than 0 = override size of border around the background"
 
 seta hud_timer 1 "enable/disable this panel"
 seta hud_timer_pos "-210 0" "position of this base of the panel"
 seta hud_timer_size "210 40" "size of this panel"
-seta hud_timer_bg 1 "enable/disable the background of this panel"
-seta hud_timer_border 30 "size of border from the background edges"
-seta hud_timer_color "" "optional R G B vector of the panel background color, otherwise use hud default"
-seta hud_timer_increment "show elapsed time instead of remaining time"
+seta hud_timer_increment 0 "show elapsed time instead of remaining time"
+seta hud_timer_bg "" "if set to something else than \"\" = override default background, if set to 0 = disable background"
+seta hud_timer_bg_color "" "optional R G B string of the background color, otherwise use hud default"
+seta hud_timer_bg_alpha 0 "if set to something else than 0 = override default alpha"
+seta hud_timer_bg_border 0 "if set to something else than 0 = override size of border around the background"
 
 seta hud_radar 1 "enable/disable this panel"
 seta hud_radar_pos "0 0" "position of this base of the panel"
 seta hud_radar_size "180 150" "size of this panel"
-seta hud_radar_bg 1 "enable/disable the background of this panel"
-seta hud_radar_border 30 "size of border from the background edges"
-seta hud_radar_color "" "optional R G B vector of the panel background color, otherwise use hud default"
+seta hud_radar_bg "" "if set to something else than \"\" = override default background, if set to 0 = disable background"
+seta hud_radar_bg_color "" "optional R G B string of the background color, otherwise use hud default"
+seta hud_radar_bg_alpha 0 "if set to something else than 0 = override default alpha"
+seta hud_radar_bg_border 0 "if set to something else than 0 = override size of border around the background"
 
 seta hud_score 1 "enable/disable this panel"
 seta hud_score_pos "-300 -37.5" "position of this base of the panel"
 seta hud_score_size "200 37.5" "size of this panel"
-seta hud_score_bg 1 "enable/disable the background of this panel"
-seta hud_score_border 30 "size of border from the background edges"
-seta hud_score_color "" "optional R G B vector of the panel background color, otherwise use hud default"
+seta hud_score_bg "" "if set to something else than \"\" = override default background, if set to 0 = disable background"
+seta hud_score_bg_color "" "optional R G B string of the background color, otherwise use hud default"
+seta hud_score_bg_alpha 0 "if set to something else than 0 = override default alpha"
+seta hud_score_bg_border 0 "if set to something else than 0 = override size of border around the background"
 
 seta hud_racetimer 1 "enable/disable this panel"
 seta hud_racetimer_pos "280 0" "position of this base of the panel"
 seta hud_racetimer_size "240 60" "size of this panel"
-seta hud_racetimer_bg 0 "enable/disable the background of this panel"
-seta hud_racetimer_border 30 "size of border from the background edges"
-seta hud_racetimer_color "" "optional R G B vector of the panel background color, otherwise use hud default"
+seta hud_racetimer_bg "" "if set to something else than \"\" = override default background, if set to 0 = disable background"
+seta hud_racetimer_bg_color "" "optional R G B string of the background color, otherwise use hud default"
+seta hud_racetimer_bg_alpha 0 "if set to something else than 0 = override default alpha"
+seta hud_racetimer_bg_border 0 "if set to something else than 0 = override size of border around the background"
 
 seta hud_vote 1 "enable/disable this panel"
 seta hud_vote_pos "-240 -60" "position of this base of the panel"
 seta hud_vote_size "240 60" "size of this panel"
-seta hud_vote_bg 0 "enable/disable the background of this panel"
-seta hud_vote_border 30 "size of border from the background edges"
-seta hud_vote_color "" "optional R G B vector of the panel background color, otherwise use hud default"
 seta hud_vote_alreadyvoted_alpha 0.75 "alpha of the vote dialog after you have voted"
+seta hud_vote_bg "" "if set to something else than \"\" = override default background, if set to 0 = disable background"
+seta hud_vote_bg_color "" "optional R G B string of the background color, otherwise use hud default"
+seta hud_vote_bg_alpha 0 "if set to something else than 0 = override default alpha"
+seta hud_vote_bg_border 0 "if set to something else than 0 = override size of border around the background"
 
 seta hud_pressedkeys 1 "enable/disable this panel"
 seta hud_pressedkeys_pos "-150 -155.97" "position of this base of the panel"
 seta hud_pressedkeys_size "150 88.47" "size of this panel"
-seta hud_pressedkeys_bg 0 "enable/disable the background of this panel"
-seta hud_pressedkeys_border 30 "size of border from the background edges"
-seta hud_pressedkeys_color "" "optional R G B vector of the panel background color, otherwise use hud default"
+seta hud_pressedkeys_bg "" "if set to something else than \"\" = override default background, if set to 0 = disable background"
+seta hud_pressedkeys_bg_color "" "optional R G B string of the background color, otherwise use hud default"
+seta hud_pressedkeys_bg_alpha 0 "if set to something else than 0 = override default alpha"
+seta hud_pressedkeys_bg_border 0 "if set to something else than 0 = override size of border around the background"
 
 // scoreboard
 seta scoreboard_border_thickness 1 "scoreboard border thickness"

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index cb76f7af5699e1c9dda8e3c1e2414a047adc0d96..5c69c161e650d3ddc530d37d43af033a992b6c04 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -467,7 +467,7 @@ void CSQC_UpdateView(float w, float h)
                }
        }
 
-       hud_alpha_fg = cvar_or("hud_alpha_fg", 1) * (1 - cvar("_menu_alpha"));
+       hud_alpha_fg = cvar_or("hud_fg_alpha", 1) * (1 - cvar("_menu_alpha"));
        hud_currentammo = cvar("hud_showcurrentammo");
        hud_hudselector = cvar("hud_hudselector");
        hud_accuracy_hud = cvar_or("hud_accuracy_hud", 1);

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index c48454d6e1b470aca349b36ce8d239d41d25ceda..4493d7bc1029fa35207e5cfec9df636e46172538 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -617,25 +617,44 @@ vector HUD_Panel_GetPos(float id)
        return pos;
 }
 
-float HUD_Panel_GetMarigin(float id)
+float HUD_Panel_GetBorder(float id)
 {
-       return bound(1, MARIGIN_MULTIPLIER * cvar_or(strcat("hud_", HUD_Panel_GetName(id), "_border"), 30), 200);
+       float border;
+       border = cvar(strcat("hud_", HUD_Panel_GetName(id), "_bg_border"));
+       if(!border)
+               border = cvar("hud_bg_border");
+       return border;
 }
 
-vector HUD_Panel_GetColor(float id)
+// draw the background/borders
+void HUD_Panel_DrawBg(float id, vector pos, vector mySize)
 {
-       if(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_color")) != "")
-               return stov(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_color")));
-       else
-               return stov(cvar_string("hud_color"));
-}
+       if(!cvar("_hud_configure") && cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg")) == "0")
+               return;
 
-float HUD_Panel_GetBgActive(float id)
-{
-       if(cvar("_hud_configure"))
-               return 1;
+       string bg;
+       bg = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg"));
+       if(bg == "")
+               bg = cvar_string("hud_bg");
+
+       if(bg != "0")
+       {
+               float border;
+               border = HUD_Panel_GetBorder(id);
+
+               vector color;
+               if(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_color")) != "")
+                       color = stov(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_color")));
+               else
+                       color = stov(cvar_string("hud_bg_color"));
+
+               float alpha;
+               alpha = cvar(strcat("hud_", HUD_Panel_GetName(id), "_bg_alpha"));
+               if(!alpha)
+                       alpha = cvar("hud_bg_alpha");
 
-       return cvar_or(strcat("hud_", HUD_Panel_GetName(id), "_bg"), 1);
+               draw_BorderPicture(pos - '1 1 0' * border, strcat("gfx/hud/", bg), mySize + '1 1 0' * 2 * border, color, alpha, '1 1 0' * (border/BORDER_MULTIPLIER));
+       }
 }
 
 vector HUD_Panel_GetProgressBarColor(string item)
@@ -664,8 +683,8 @@ vector HUD_Panel_CheckResize(float id, vector myPos, vector mySize)
                targPos = HUD_Panel_GetPos(i);
                targSize = HUD_Panel_GetSize(i);
 
-               targPos = HUD_Panel_GetPos(i) - '1 1 0' * HUD_Panel_GetMarigin(id);
-               targSize = HUD_Panel_GetSize(i) + '2 2 0' * HUD_Panel_GetMarigin(id);
+               targPos = HUD_Panel_GetPos(i) - '1 1 0' * HUD_Panel_GetBorder(id);
+               targSize = HUD_Panel_GetSize(i) + '2 2 0' * HUD_Panel_GetBorder(id);
 
                if(myPos_y + mySize_y < targPos_y)
                        continue;
@@ -774,8 +793,8 @@ vector HUD_Panel_CheckMove(float id, vector myPos, vector mySize)
                if(i == id || !HUD_Panel_CheckActive(i))
                        continue;
 
-               targPos = HUD_Panel_GetPos(i) - '1 1 0' * HUD_Panel_GetMarigin(id);
-               targSize = HUD_Panel_GetSize(i) + '2 2 0' * HUD_Panel_GetMarigin(id);
+               targPos = HUD_Panel_GetPos(i) - '1 1 0' * HUD_Panel_GetBorder(id);
+               targSize = HUD_Panel_GetSize(i) + '2 2 0' * HUD_Panel_GetBorder(id);
 
                if(myPos_y + mySize_y < targPos_y)
                        continue;
@@ -908,7 +927,7 @@ void HUD_Panel_Mouse()
                {
                        panelPos = HUD_Panel_GetPos(i);
                        panelSize = HUD_Panel_GetSize(i);
-                       border = HUD_Panel_GetMarigin(i);
+                       border = HUD_Panel_GetBorder(i);
                        if(prevMouseClicked == 0) {
                                // move
                                if(mousepos_x >= panelPos_x && mousepos_y >= panelPos_y && mousepos_x <= panelPos_x + panelSize_x && mousepos_y <= panelPos_y + panelSize_y)
@@ -1025,14 +1044,12 @@ float weaponorder_cmp(float i, float j, entity pass)
 
 void HUD_WeaponIcons()
 {
-       float alpha, height, border, accuracybar_height, stat_weapons; // "constants"
-       vector pos, mySize, mysize, mypos, color, accuracy_color;
+       float alpha, height, accuracybar_height, stat_weapons; // "constants"
+       vector pos, mySize, mysize, mypos, accuracy_color;
        float i, id, fade, weapon_stats, weapon_hit, weapon_damage, weapon_cnt; // variables
 
-       border = HUD_Panel_GetMarigin(0);
        pos = HUD_Panel_GetPos(0);
        mySize = HUD_Panel_GetSize(0);
-       color = HUD_Panel_GetColor(0);
        accuracybar_height = cvar_or("hud_weaponicons_accuracybar_height", 3);
 
        stat_weapons = getstati(STAT_WEAPONS);
@@ -1047,8 +1064,7 @@ void HUD_WeaponIcons()
        }
        heapsort(weapon_cnt, weaponorder_swap, weaponorder_cmp, world);
 
-       if(HUD_Panel_GetBgActive(0) && weapon_cnt)
-               draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
+       HUD_Panel_DrawBg(0, pos, mySize);
 
        // hits
        weapon_stats = getstati(STAT_DAMAGE_HITS);
@@ -1089,7 +1105,7 @@ void HUD_WeaponIcons()
                        weapon_damage = weapon_fired[self.weapon-WEP_FIRST];
 
                        if(self.weapon == activeweapon)
-                               drawpic(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "gfx/hud/sb_ammobg", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), color, fade * hud_alpha_fg, DRAWFLAG_NORMAL);
+                               drawpic(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "gfx/hud/sb_ammobg", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * hud_alpha_fg, DRAWFLAG_NORMAL);
                        drawpic(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), strcat("gfx/hud/inv_weapon", self.netname), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * hud_alpha_fg, DRAWFLAG_NORMAL);
 
                        if(cvar_or("hud_weaponicons_number", 1))
@@ -1163,16 +1179,12 @@ void HUD_Inventory()
 {
        float i;
        float stat_items;
-       float border;
 
-       vector pos, mySize, mysize, mypos, color;
-       border = HUD_Panel_GetMarigin(1);
+       vector pos, mySize, mysize, mypos;
        pos = HUD_Panel_GetPos(1);
        mySize = HUD_Panel_GetSize(1);
-       color = HUD_Panel_GetColor(1);
 
-       if(HUD_Panel_GetBgActive(1))
-               draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
+       HUD_Panel_DrawBg(1, pos, mySize);
 
        // ammo
        stat_items = getstati(STAT_ITEMS);
@@ -1182,14 +1194,14 @@ void HUD_Inventory()
                if(cvar("_hud_configure"))
                        a = 100;
 
-               if(cvar("hud_ammo_onlycurrent")) {
+               if(cvar("hud_inventory_onlycurrent")) {
                        if (stat_items & GetAmmoItemCode(i)) {
-                               drawpic(pos - '1 1 0' * border, "gfx/hud/sb_ammobg", mysize + '1 1 0' * border, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-                               drawpic(pos + eX * mysize_x * 1.7, GetAmmoPicture(i), '24 24 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+                               drawpic(pos, "gfx/hud/sb_ammobg", mySize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+                               drawpic(pos + eY * 0.05 * mySize_y, GetAmmoPicture(i), '1 1 0' * 0.8 * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
                                if(a < 10)
-                                       HUD_DrawXNum(pos + '5 5 0', a, 3, 0, 24, '0.7 0 0', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+                                       HUD_DrawXNum(pos + eX * 0.8 * mySize_y + eY * 0.25 * mySize_y, a, strlen(ftos(a)), 0, 0.5 * mySize_y, '0.7 0 0', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
                                else
-                                       HUD_DrawXNum(pos + '5 5 0', a, 3, 0, 24, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+                                       HUD_DrawXNum(pos + eX * 0.8 * mySize_y + eY * 0.25 * mySize_y, a, strlen(ftos(a)), 0, 0.5 * mySize_y, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
                        }
                } else {
                        if (a > 0) {
@@ -1259,16 +1271,11 @@ void HUD_Powerups() {
                        return;
        }
 
-       float border;
-
-       vector pos, mySize, color;
-       border = HUD_Panel_GetMarigin(2);
+       vector pos, mySize;
        pos = HUD_Panel_GetPos(2);
        mySize = HUD_Panel_GetSize(2);
-       color = HUD_Panel_GetColor(2);
 
-       if(HUD_Panel_GetBgActive(2))
-               draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
+       HUD_Panel_DrawBg(2, pos, mySize);
 
        float strength_time, shield_time;
 
@@ -1413,16 +1420,11 @@ void HUD_Powerups() {
 //
 void HUD_HealthArmor(void)
 {
-       float border;
-
-       vector pos, mySize, color;
-       border = HUD_Panel_GetMarigin(3);
+       vector pos, mySize;
        pos = HUD_Panel_GetPos(3);
        mySize = HUD_Panel_GetSize(3);
-       color = HUD_Panel_GetColor(3);
 
-       if(HUD_Panel_GetBgActive(3))
-               draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
+       HUD_Panel_DrawBg(3, pos, mySize);
 
        float armor, health, x;
        armor = getstati(STAT_ARMOR);
@@ -1571,16 +1573,11 @@ void HUD_HealthArmor(void)
 //
 void HUD_Score()
 {
-       float border;
-
-       vector pos, mySize, color;
-       border = HUD_Panel_GetMarigin(7);
+       vector pos, mySize;
        pos = HUD_Panel_GetPos(7);
        mySize = HUD_Panel_GetSize(7);
-       color = HUD_Panel_GetColor(7);
 
-       if(HUD_Panel_GetBgActive(7))
-               draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
+       HUD_Panel_DrawBg(7, pos, mySize);
 
        float score, distribution, leader;
        float score_len, distr_len;
@@ -1662,16 +1659,11 @@ void HUD_Score()
 // Race timer (#8)
 //
 void HUD_RaceTimer (void) {
-       float border;
-
-       vector pos, mySize, color;
-       border = HUD_Panel_GetMarigin(8);
+       vector pos, mySize;
        pos = HUD_Panel_GetPos(8);
        mySize = HUD_Panel_GetSize(8);
-       color = HUD_Panel_GetColor(8);
 
-       if(HUD_Panel_GetBgActive(8))
-               draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
+       HUD_Panel_DrawBg(8, pos, mySize);
 
        drawfont = hud_bigfont;
        float a, t;
@@ -1790,16 +1782,11 @@ void HUD_RaceTimer (void) {
 // Notification area (#4)
 void HUD_Notify (void)
 {
-       float border;
-
-       vector pos, mySize, color;
-       border = HUD_Panel_GetMarigin(4);
+       vector pos, mySize;
        pos = HUD_Panel_GetPos(4);
        mySize = HUD_Panel_GetSize(4);
-       color = HUD_Panel_GetColor(4);
 
-       if(HUD_Panel_GetBgActive(4))
-               draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
+       HUD_Panel_DrawBg(4, pos, mySize);
 
        string s;
        entity tm;
@@ -1931,13 +1918,9 @@ float vote_change; // "time" when vote_active changed
 
 void HUD_VoteWindow(void) 
 {
-       float border;
-
-       vector pos, mySize, color;
-       border = HUD_Panel_GetMarigin(9);
+       vector pos, mySize;
        pos = HUD_Panel_GetPos(9);
        mySize = HUD_Panel_GetSize(9);
-       color = HUD_Panel_GetColor(9);
 
        string s;
        float a;
@@ -1959,8 +1942,7 @@ void HUD_VoteWindow(void)
                vote_needed = 4;
        }
 
-       if(HUD_Panel_GetBgActive(9))
-               draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg * vote_alpha, '1 1 0' * (border/MARIGIN_MULTIPLIER));
+       HUD_Panel_DrawBg(9, pos, mySize);
 
        if(vote_alpha) {
                a = vote_alpha * bound(cvar_or("hud_vote_alreadyvoted_alpha", 0.75), 1 - vote_highlighted, 1);
@@ -2490,16 +2472,11 @@ void CSQC_race_hud(void)
 //
 void HUD_Timer()
 {
-       float border;
-
-       vector pos, mySize, color;
-       border = HUD_Panel_GetMarigin(5);
+       vector pos, mySize;
        pos = HUD_Panel_GetPos(5);
        mySize = HUD_Panel_GetSize(5);
-       color = HUD_Panel_GetColor(5);
 
-       if(HUD_Panel_GetBgActive(5))
-               draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
+       HUD_Panel_DrawBg(5, pos, mySize);
 
        float timelimit, elapsedTime, minutes, seconds, timeleft, minutesLeft, secondsLeft;
 
@@ -2567,16 +2544,11 @@ void HUD_Timer()
 
 void HUD_Radar(void)
 {
-       float border;
-
-       vector pos, mySize, color;
-       border = HUD_Panel_GetMarigin(6);
+       vector pos, mySize;
        pos = HUD_Panel_GetPos(6);
        mySize = HUD_Panel_GetSize(6);
-       color = HUD_Panel_GetColor(6);
 
-       if(HUD_Panel_GetBgActive(6))
-               draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
+       HUD_Panel_DrawBg(6, pos, mySize);
 
        local float color1, color2; // color already declared as a global in hud.qc
        local vector rgb;
@@ -2730,16 +2702,11 @@ Main HUD system
 
 void HUD_DrawPressedKeys(void)
 {
-       float border;
-
-       vector pos, mySize, color;
-       border = HUD_Panel_GetMarigin(10);
+       vector pos, mySize;
        pos = HUD_Panel_GetPos(10);
        mySize = HUD_Panel_GetSize(10);
-       color = HUD_Panel_GetColor(10);
 
-       if(HUD_Panel_GetBgActive(10))
-               draw_BorderPicture(pos - '1 1 0' * border, "gfx/hud/border", mySize + '1 1 0' * 2 * border, color, hud_alpha_bg, '1 1 0' * (border/MARIGIN_MULTIPLIER));
+       HUD_Panel_DrawBg(10, pos, mySize);
 
        float pressedkeys;
 
@@ -2860,7 +2827,7 @@ void HUD_Reset (void)
 
 void HUD_Main (void)
 {
-       hud_alpha_bg = cvar_or("hud_alpha_bg", 0.8) * (1 - cvar("_menu_alpha"));
+       hud_alpha_bg = cvar_or("hud_bg_alpha", 0.8) * (1 - cvar("_menu_alpha"));
        hud_border_thickness = bound(0, cvar("hud_border_thickness"), 5);
        hud_accuracy_border_thickness = bound(0, cvar_or("hud_accuracy_border_thickness", 1), 5);
        hud_color_bg_team = cvar("hud_color_bg_team");

diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh
index 91edd4a6a95660cff25150d340e6d202c96619bb..5aaa750790903a3291675bad6ab10d1dbc11b671 100644 (file)
--- a/qcsrc/client/hud.qh
+++ b/qcsrc/client/hud.qh
@@ -4,7 +4,7 @@ void CSQC_ctf_hudreset();
 void CSQC_ctf_hud();
 void CSQC_nb_hud();
 void CSQC_race_hud();
-const float MARIGIN_MULTIPLIER = 0.25;
+const float BORDER_MULTIPLIER = 0.25;
 float hud_color_bg_team;
 float scoreboard_bottom;
 float weapon_hits[WEP_MAXCOUNT];