X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fammo.qc;h=94545ac4bff69ea3511cb20866973709d190895a;hb=3cc1e9c4a52d70b4d7097a0a584cbb391570c6e2;hp=bd3ccd068160d9130db8f308fe28548a4c092dad;hpb=4ee2807b2d8f808928ef14b3e814945b3edb4350;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud/panel/ammo.qc b/qcsrc/client/hud/panel/ammo.qc
index bd3ccd068..94545ac4b 100644
--- a/qcsrc/client/hud/panel/ammo.qc
+++ b/qcsrc/client/hud/panel/ammo.qc
@@ -104,7 +104,7 @@ void HUD_Ammo()
 			return;
 	}
 
-	HUD_Panel_UpdateCvars();
+	HUD_Panel_LoadCvars();
 
 	draw_beginBoldFont();
 
@@ -116,7 +116,7 @@ void HUD_Ammo()
 		HUD_Scale_Enable();
 	else
 		HUD_Scale_Disable();
-	HUD_Panel_DrawBg(1);
+	HUD_Panel_DrawBg();
 	if(panel_bg_padding)
 	{
 		pos += '1 1 0' * panel_bg_padding;
@@ -169,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;