fix typo, allow disabling the border code and just drawing the border image by means...

diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg
index df3e431ab5883688878d5f59a6c991959bf99b84..df069d36715f226c4e0a83e7c20b794b1432bd33 100644 (file)
--- a/_hud_descriptions.cfg
+++ b/_hud_descriptions.cfg
@@ -73,8 +73,8 @@ seta hud_panel_powerups_bg_alpha "" "if set to something else than \"\" = overri
 seta hud_panel_powerups_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_panel_powerups_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
 seta hud_panel_powerups_progressbar "" "enable progressbar in panel"
-seta hud_panel_healtharmor_progressbar_strength "" "progressbar image for strength"
-seta hud_panel_healtharmor_progressbar_shield "" "progressbar image for shield"
+seta hud_panel_powerups_progressbar_strength "" "progressbar image for strength"
+seta hud_panel_powerups_progressbar_shield "" "progressbar image for shield"
 
 seta hud_panel_healtharmor "" "enable/disable this panel, 2 = combined health/armor display"
 seta hud_panel_healtharmor_pos "" "position of this panel"

diff --git a/hud_luminos_minimal.cfg b/hud_luminos_minimal.cfg
index f3c14739431311d24eb381f98827114e600b2df5..9d47932feb09ecd3c3816e8476c24dcda1f1c70b 100644 (file)
--- a/hud_luminos_minimal.cfg
+++ b/hud_luminos_minimal.cfg
@@ -71,8 +71,8 @@ seta hud_panel_powerups_flip "1"
 seta hud_panel_powerups_iconalign "1"
 seta hud_panel_powerups_baralign "1"
 seta hud_panel_powerups_progressbar "1"
-seta hud_panel_healtharmor_progressbar_strength "progressbar"
-seta hud_panel_healtharmor_progressbar_shield "progressbar"
+seta hud_panel_powerups_progressbar_strength "progressbar"
+seta hud_panel_powerups_progressbar_shield "progressbar"
 
 seta hud_panel_healtharmor 1
 seta hud_panel_healtharmor_pos "0.350000 0.890000"

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index fde150d033b461a10ffdfc3d0961d582a879c9a9..820cca4748f6a951a5e902a9302d5fadee623a42 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -14,7 +14,12 @@ Misc HUD functions
 //   1/4 height: bottom part
 void draw_BorderPicture(vector theOrigin, string pic, vector theSize, vector theColor, float theAlpha, vector theBorderSize)
 {
-       if (theBorderSize_x <= 0 && theBorderSize_y <= 0) // no border
+    if (theBorderSize_x < 0 && theBorderSize_y < 0) // draw whole image as it is
+    {
+               drawpic(theOrigin, pic, theSize, theColor, theAlpha, 0);
+               return;
+    }
+       if (theBorderSize_x == 0 && theBorderSize_y == 0) // no border
        {
                // draw only the central part
                drawsubpic(theOrigin, theSize, pic, '0.25 0.25 0', '0.5 0.5 0', theColor, theAlpha, 0);