From: FruitieX Date: Mon, 29 Nov 2010 17:17:52 +0000 (+0200) Subject: fix typo, allow disabling the border code and just drawing the border image by means... X-Git-Tag: xonotic-v0.1.0preview~94^2~5 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=da5fa04e4df8e91dd6b9bf7960ca47c860c58a64;p=xonotic%2Fxonotic-data.pk3dir.git fix typo, allow disabling the border code and just drawing the border image by means of simple stretching (by setting the border size negative) --- diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg index df3e431ab..df069d367 100644 --- 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 f3c147394..9d47932fe 100644 --- 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 fde150d03..820cca474 100644 --- 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);