From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 10 Apr 2008 03:48:29 +0000 (+0000)
Subject: patch from esteel which moves icons to the right of numbers on the
X-Git-Tag: xonotic-v0.1.0preview~2279
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=64c58f2da6bca3714d04363db7281456b7d7fc44;p=xonotic%2Fdarkplaces.git
patch from esteel which moves icons to the right of numbers on the
nexuiz alternate hud to give a better impression of what the numbers
refer to
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8250 d7cf8633-e32d-0410-b094-e92efae38249
---
diff --git a/sbar.c b/sbar.c
index f760c90a..bcf4d24d 100644
--- a/sbar.c
+++ b/sbar.c
@@ -1305,50 +1305,50 @@ void Sbar_Draw (void)
// armor
if (cl.stats[STAT_ARMOR] > 0)
{
- Sbar_DrawStretchPic (0, 0, sb_armor[0], sbar_alpha_fg.value, 24, 24);
+ Sbar_DrawStretchPic (72, 0, sb_armor[0], sbar_alpha_fg.value, 24, 24);
if(cl.stats[STAT_ARMOR] > 200)
- Sbar_DrawXNum(24,0,cl.stats[STAT_ARMOR],3,24,0,1,0,1,0);
+ Sbar_DrawXNum(0,0,cl.stats[STAT_ARMOR],3,24,0,1,0,1,0);
else if(cl.stats[STAT_ARMOR] > 100)
- Sbar_DrawXNum(24,0,cl.stats[STAT_ARMOR],3,24,0.2,1,0.2,1,0);
+ Sbar_DrawXNum(0,0,cl.stats[STAT_ARMOR],3,24,0.2,1,0.2,1,0);
else if(cl.stats[STAT_ARMOR] > 50)
- Sbar_DrawXNum(24,0,cl.stats[STAT_ARMOR],3,24,0.6,0.7,0.8,1,0);
+ Sbar_DrawXNum(0,0,cl.stats[STAT_ARMOR],3,24,0.6,0.7,0.8,1,0);
else if(cl.stats[STAT_ARMOR] > 25)
- Sbar_DrawXNum(24,0,cl.stats[STAT_ARMOR],3,24,1,1,0.2,1,0);
+ Sbar_DrawXNum(0,0,cl.stats[STAT_ARMOR],3,24,1,1,0.2,1,0);
else
- Sbar_DrawXNum(24,0,cl.stats[STAT_ARMOR],3,24,0.7,0,0,1,0);
+ Sbar_DrawXNum(0,0,cl.stats[STAT_ARMOR],3,24,0.7,0,0,1,0);
}
// health
if (cl.stats[STAT_HEALTH] != 0)
{
- Sbar_DrawStretchPic (112, 0, sb_health, sbar_alpha_fg.value, 24, 24);
+ Sbar_DrawStretchPic (184, 0, sb_health, sbar_alpha_fg.value, 24, 24);
if(cl.stats[STAT_HEALTH] > 200)
- Sbar_DrawXNum(136,0,cl.stats[STAT_HEALTH],3,24,0,1,0,1,0);
+ Sbar_DrawXNum(112,0,cl.stats[STAT_HEALTH],3,24,0,1,0,1,0);
else if(cl.stats[STAT_HEALTH] > 100)
- Sbar_DrawXNum(136,0,cl.stats[STAT_HEALTH],3,24,0.2,1,0.2,1,0);
+ Sbar_DrawXNum(112,0,cl.stats[STAT_HEALTH],3,24,0.2,1,0.2,1,0);
else if(cl.stats[STAT_HEALTH] > 50)
- Sbar_DrawXNum(136,0,cl.stats[STAT_HEALTH],3,24,0.6,0.7,0.8,1,0);
+ Sbar_DrawXNum(112,0,cl.stats[STAT_HEALTH],3,24,0.6,0.7,0.8,1,0);
else if(cl.stats[STAT_HEALTH] > 25)
- Sbar_DrawXNum(136,0,cl.stats[STAT_HEALTH],3,24,1,1,0.2,1,0);
+ Sbar_DrawXNum(112,0,cl.stats[STAT_HEALTH],3,24,1,1,0.2,1,0);
else
- Sbar_DrawXNum(136,0,cl.stats[STAT_HEALTH],3,24,0.7,0,0,1,0);
+ Sbar_DrawXNum(112,0,cl.stats[STAT_HEALTH],3,24,0.7,0,0,1,0);
}
// ammo
if ((cl.stats[STAT_ITEMS] & (NEX_IT_SHELLS | NEX_IT_BULLETS | NEX_IT_ROCKETS | NEX_IT_CELLS)) || cl.stats[STAT_AMMO] != 0)
{
if (cl.stats[STAT_ITEMS] & NEX_IT_SHELLS)
- Sbar_DrawStretchPic (224, 0, sb_ammo[0], sbar_alpha_fg.value, 24, 24);
+ Sbar_DrawStretchPic (296, 0, sb_ammo[0], sbar_alpha_fg.value, 24, 24);
else if (cl.stats[STAT_ITEMS] & NEX_IT_BULLETS)
- Sbar_DrawStretchPic (224, 0, sb_ammo[1], sbar_alpha_fg.value, 24, 24);
+ Sbar_DrawStretchPic (296, 0, sb_ammo[1], sbar_alpha_fg.value, 24, 24);
else if (cl.stats[STAT_ITEMS] & NEX_IT_ROCKETS)
- Sbar_DrawStretchPic (224, 0, sb_ammo[2], sbar_alpha_fg.value, 24, 24);
+ Sbar_DrawStretchPic (296, 0, sb_ammo[2], sbar_alpha_fg.value, 24, 24);
else if (cl.stats[STAT_ITEMS] & NEX_IT_CELLS)
- Sbar_DrawStretchPic (224, 0, sb_ammo[3], sbar_alpha_fg.value, 24, 24);
+ Sbar_DrawStretchPic (296, 0, sb_ammo[3], sbar_alpha_fg.value, 24, 24);
if(cl.stats[STAT_AMMO] > 10)
- Sbar_DrawXNum(248, 0, cl.stats[STAT_AMMO], 3, 24, 0.6,0.7,0.8,1,0);
+ Sbar_DrawXNum(224, 0, cl.stats[STAT_AMMO], 3, 24, 0.6,0.7,0.8,1,0);
else
- Sbar_DrawXNum(248, 0, cl.stats[STAT_AMMO], 3, 24, 0.7,0,0,1,0);
+ Sbar_DrawXNum(224, 0, cl.stats[STAT_AMMO], 3, 24, 0.7,0,0,1,0);
}
if (sbar_x + 320 + 160 <= vid_conwidth.integer)