finally, fuel added to the health/armor panel ;)

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 980e9e5576df45405a0820e9aa941c675efc7b4a..7a72c52291578d91a316e2d612f96269a93e4010 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1374,6 +1374,7 @@ seta hud_healtharmor_color "" "optional R G B vector of the panel background col
 seta hud_healtharmor_flip 1 "flip health/armor positions"
 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"
 
 seta hud_notify 0 "enable/disable this panel"
 seta hud_notify_pos "-300 -37.5" "position of this base of the panel"

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index f0c108826e336b59680fa1a898f15218f184a841..e7d36503b506efc710f15e0d07929e38591be352 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -1239,20 +1239,6 @@ void HUD_Inventory()
                        }
                }
        }
-
-       // fuel ammo
-       a = getstati(GetAmmoStat(4)); // how much fuel do we have?
-
-       if (a > 0) { // if we have fuel, draw the amount
-               if(pos_x + 0.5 * mySize_x > 0.5 * vid_conwidth)
-                       mypos_x += pos_x + mySize_x - 0; // TODO!
-
-               drawpic(mypos - '0 2 0' + '52 0 0', GetAmmoPicture(4), '20 20 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
-               if (a > 10)
-                       HUD_DrawXNum(mypos, a, 3, 0, 16, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
-               else
-                       HUD_DrawXNum(mypos, a, 3, 0, 16, '0.7 0 0', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
-       }
 }
 
 
@@ -1495,7 +1481,7 @@ void HUD_HealthArmor(void)
                float leftactive, rightactive;
                float leftalpha, rightalpha;
                // TODO!
-               if (cvar(strcat("hud_", HUD_Panel_GetName(3), "_flip"))) { // old style layout with armor left of health
+               if (cvar(strcat("hud_", HUD_Panel_GetName(3), "_flip"))) { // old style layout with armor left/top of health
                        leftname = "armor";
                        leftcnt = armor;
                        if(leftcnt)
@@ -1519,6 +1505,8 @@ void HUD_HealthArmor(void)
                        rightalpha = min((armor+10)/55, 1);
                }
 
+               float fuel;
+               fuel = getstati(GetAmmoStat(4)); // how much fuel do we have?
 
                if (mySize_x/mySize_y > 5)
                {
@@ -1537,6 +1525,9 @@ void HUD_HealthArmor(void)
                                drawpic(pos + eX * mySize_x - eX * mySize_y, strcat("gfx/hud/sb_", rightname), '1 1 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL);
                                HUD_DrawXNum_Colored(pos + eX * mySize_x - eX * 2.5 * mySize_y + eY * 0.25 * mySize_y, rightcnt, 3, 0.5 * mySize_y, hud_alpha_fg);
                        }
+
+                       if(fuel)
+                               drawpic(pos, "gfx/hud/statusbar", eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y, HUD_Panel_GetProgressBarColor("fuel"), hud_alpha_fg * 0.8, DRAWFLAG_NORMAL);
                }
                else if (mySize_x/mySize_y > 3.2)
                {
@@ -1557,6 +1548,9 @@ void HUD_HealthArmor(void)
                                drawpic(pos + eX * mySize_x - eX * 1.1 * mySize_y, strcat("gfx/hud/sb_", rightname), '0.7 0.7 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL);
                                HUD_DrawXNum_Colored(pos + eX * mySize_x - eX * len * 0.5 * mySize_y - eX * ((3-len)/2) * 0.5 * mySize_y + eY * 0.55 * mySize_y, rightcnt, len, 0.5 * mySize_y, hud_alpha_fg);
                        }
+
+                       if(fuel)
+                               drawpic(pos, "gfx/hud/statusbar", eX * mySize_x * min(1, fuel/100) + eY * 0.15 * mySize_y, HUD_Panel_GetProgressBarColor("fuel"), hud_alpha_fg * 0.8, DRAWFLAG_NORMAL);
                }
                else
                {
@@ -1577,6 +1571,9 @@ void HUD_HealthArmor(void)
                                drawpic(pos + eY * 0.5 * mySize_y, strcat("gfx/hud/sb_", rightname), '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * hud_alpha_fg, DRAWFLAG_NORMAL);
                                HUD_DrawXNum_Colored(pos + eX * 0.5 * mySize_y + eY * 0.5 * mySize_y, rightcnt, len, 0.5 * mySize_y, hud_alpha_fg);
                        }
+
+                       if(fuel)
+                               drawpic(pos, "gfx/hud/statusbar", eX * mySize_x * min(1, fuel/100) + eY * 0.1 * mySize_y, HUD_Panel_GetProgressBarColor("fuel"), hud_alpha_fg * 0.8, DRAWFLAG_NORMAL);
                }
        }
 }