Merge branch 'terencehill/spectate_player' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hud / panel / ammo.qc

diff --git a/qcsrc/client/hud/panel/ammo.qc b/qcsrc/client/hud/panel/ammo.qc
index 0636f3f2e972cfc551eb991b4631732d90aa79ab..95ceced82c74d7ca6a39adc2084de9e950c85a2c 100644 (file)
--- a/qcsrc/client/hud/panel/ammo.qc
+++ b/qcsrc/client/hud/panel/ammo.qc
@@ -6,6 +6,7 @@
 #include <client/view.qh>
 #include <common/t_items.qh>
 #include <common/wepent.qh>
+#include <common/mutators/mutator/nades/nades.qh>
 
 // Ammo (#1)
 
@@ -19,12 +20,10 @@ void DrawNadeProgressBar(vector myPos, vector mySize, float progress, vector col
                autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
 }
 
-void DrawAmmoNades(vector myPos, vector mySize, bool draw_expanding, float expand_time); // TODO: mutator
-
 void DrawAmmoItem(vector myPos, vector mySize, int ammoType, bool isCurrent, bool isInfinite)
 {
-    TC(bool, isCurrent); TC(bool, isInfinite);
-       if(ammoType == RESOURCE_NONE)
+       TC(bool, isCurrent); TC(bool, isInfinite);
+       if(ammoType == RES_NONE)
                return;
 
        // Initialize variables
@@ -32,7 +31,7 @@ void DrawAmmoItem(vector myPos, vector mySize, int ammoType, bool isCurrent, boo
        int ammo;
        if(autocvar__hud_configure)
        {
-               isCurrent = (ammoType == RESOURCE_ROCKETS); // Rockets always current
+               isCurrent = (ammoType == RES_ROCKETS); // Rockets always current
                ammo = 60;
        }
        else
@@ -178,13 +177,13 @@ void HUD_Ammo()
 
        Weapon wep = wepent.switchweapon;
        int i;
-       bool infinite_ammo = (STAT(ITEMS) & IT_UNLIMITED_WEAPON_AMMO);
+       bool infinite_ammo = (STAT(ITEMS) & IT_UNLIMITED_AMMO);
        row = column = 0;
        if(autocvar_hud_panel_ammo_onlycurrent)
        {
                if(autocvar__hud_configure)
                {
-                       DrawAmmoItem(pos, ammo_size, RESOURCE_ROCKETS, true, false);
+                       DrawAmmoItem(pos, ammo_size, RES_ROCKETS, true, false);
                }
                else
                {