X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fammo.qc;h=9e8320452a5e7dcf8db20213e12091dbd9ee1216;hb=7e474d576080259e21690de30778b17029b5c0f2;hp=94545ac4bff69ea3511cb20866973709d190895a;hpb=f4c77946d2b388b2ef4fae1057d1a636d9850923;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud/panel/ammo.qc b/qcsrc/client/hud/panel/ammo.qc
index 94545ac4b..9e8320452 100644
--- a/qcsrc/client/hud/panel/ammo.qc
+++ b/qcsrc/client/hud/panel/ammo.qc
@@ -1,6 +1,11 @@
 #include "ammo.qh"
 
+#include <client/autocvars.qh>
+#include <client/defs.qh>
+#include <client/miscfunctions.qh>
+#include <client/view.qh>
 #include <common/t_items.qh>
+#include <common/wepent.qh>
 
 // Ammo (#1)
 
@@ -150,7 +155,7 @@ void HUD_Ammo()
 
 	rows = HUD_GetRowCount(total_ammo_count, mySize, 3);
 	columns = ceil((total_ammo_count)/rows);
-	ammo_size = eX * mySize.x*(1/columns) + eY * mySize.y*(1/rows);
+	ammo_size = vec2(mySize.x / columns, mySize.y / rows);
 
 	vector offset = '0 0 0';
 	float newSize;
@@ -207,7 +212,7 @@ void HUD_Ammo()
 		{
 			ammotype = GetAmmoFieldFromNum(i);
 			DrawAmmoItem(
-				pos + eX * column * (ammo_size.x + offset.x) + eY * row * (ammo_size.y + offset.y),
+				pos + vec2(column * (ammo_size.x + offset.x), row * (ammo_size.y + offset.y)),
 				ammo_size,
 				ammotype,
 				(wep.ammo_field == ammotype),
@@ -229,7 +234,7 @@ void HUD_Ammo()
 
 		float f = bound(0, nade_statuschange_elapsedtime*2, 1);
 
-		DrawAmmoNades(pos + eX * column * (ammo_size.x + offset.x) + eY * row * (ammo_size.y + offset.y), ammo_size, nade_prevstatus < nade_cnt && nade_cnt != 0 && f < 1, f);
+		DrawAmmoNades(pos + vec2(column * (ammo_size.x + offset.x), row * (ammo_size.y + offset.y)), ammo_size, nade_prevstatus < nade_cnt && nade_cnt != 0 && f < 1, f);
 	}
 
 	draw_endBoldFont();