Add a networked entity to hold weapon state

[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 db16a869725f23728d27e018163833d4a03a8858..94545ac4bff69ea3511cb20866973709d190895a 100644 (file)
--- a/qcsrc/client/hud/panel/ammo.qc
+++ b/qcsrc/client/hud/panel/ammo.qc
@@ -1,6 +1,5 @@
 #include "ammo.qh"
 
-#include "scoreboard.qh"
 #include <common/t_items.qh>
 
 // Ammo (#1)
@@ -105,9 +104,7 @@ void HUD_Ammo()
                        return;
        }
 
-       if(1 - scoreboard_fade_alpha <= 0)
-               return;
-       HUD_Panel_LoadCvars(1 - scoreboard_fade_alpha);
+       HUD_Panel_LoadCvars();
 
        draw_beginBoldFont();
 
@@ -172,7 +169,9 @@ void HUD_Ammo()
                ammo_size.y = newSize;
        }
 
-       Weapon wep = switchweapon;
+       entity wepent = viewmodels[0]; // TODO: unhardcode
+
+       Weapon wep = wepent.switchweapon;
        int i;
        bool infinite_ammo = (STAT(ITEMS) & IT_UNLIMITED_WEAPON_AMMO);
        row = column = 0;