Merge branch 'TimePath/combined_updates' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 14 Dec 2014 11:38:28 +0000 (11:38 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 14 Dec 2014 11:38:28 +0000 (11:38 +0000)
TimePath/combined_updates

samual/combined_updates without the bad merge with nyov's effects changes

See merge request !50

qcsrc/client/hud.qc

index b928aa5..e78a691 100644 (file)
@@ -985,7 +985,7 @@ void HUD_Ammo(void)
        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)
        {
@@ -1059,7 +1059,6 @@ void HUD_Ammo(void)
                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),