]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix ammo panel layout
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 14 Dec 2014 06:48:34 +0000 (17:48 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 14 Dec 2014 06:48:34 +0000 (17:48 +1100)
Fixes #1415

qcsrc/client/hud.qc

index b928aa512a514ddd6181c409bc46b630dc91c831..e78a69108e31e6803fa31905fffb809cf9a2cd7f 100644 (file)
@@ -985,7 +985,7 @@ void HUD_Ammo(void)
        if (autocvar_hud_panel_ammo_onlycurrent)
                total_ammo_count = 1;
        else
        if (autocvar_hud_panel_ammo_onlycurrent)
                total_ammo_count = 1;
        else
-               total_ammo_count = AMMO_COUNT - 1; // fuel
+               total_ammo_count = AMMO_COUNT;
 
        if(draw_nades)
        {
 
        if(draw_nades)
        {
@@ -1059,7 +1059,6 @@ void HUD_Ammo(void)
                row = column = 0;
                for(i = 0; i < AMMO_COUNT; ++i)
                {
                row = column = 0;
                for(i = 0; i < AMMO_COUNT; ++i)
                {
-                       if(i == 4) continue; // fuel
                        ammotype = GetAmmoFieldFromNum(i);
                        DrawAmmoItem(
                                pos + eX * column * (ammo_size_x + offset_x) + eY * row * (ammo_size_y + offset_y),
                        ammotype = GetAmmoFieldFromNum(i);
                        DrawAmmoItem(
                                pos + eX * column * (ammo_size_x + offset_x) + eY * row * (ammo_size_y + offset_y),