X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fammo.qc;h=0636f3f2e972cfc551eb991b4631732d90aa79ab;hb=f169c06d31a603951f2edc016b793d7a96dece3f;hp=9e8320452a5e7dcf8db20213e12091dbd9ee1216;hpb=ee5353529c2fee304ac944aa19af53cc85eca7b0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud/panel/ammo.qc b/qcsrc/client/hud/panel/ammo.qc
index 9e8320452..0636f3f2e 100644
--- a/qcsrc/client/hud/panel/ammo.qc
+++ b/qcsrc/client/hud/panel/ammo.qc
@@ -21,10 +21,10 @@ void DrawNadeProgressBar(vector myPos, vector mySize, float progress, vector col
 
 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)
+void DrawAmmoItem(vector myPos, vector mySize, int ammoType, bool isCurrent, bool isInfinite)
 {
     TC(bool, isCurrent); TC(bool, isInfinite);
-	if(ammoType == ammo_none)
+	if(ammoType == RESOURCE_NONE)
 		return;
 
 	// Initialize variables
@@ -32,7 +32,7 @@ void DrawAmmoItem(vector myPos, vector mySize, .int ammoType, bool isCurrent, bo
 	int ammo;
 	if(autocvar__hud_configure)
 	{
-		isCurrent = (ammoType == ammo_rockets); // Rockets always current
+		isCurrent = (ammoType == RESOURCE_ROCKETS); // Rockets always current
 		ammo = 60;
 	}
 	else
@@ -184,14 +184,14 @@ void HUD_Ammo()
 	{
 		if(autocvar__hud_configure)
 		{
-			DrawAmmoItem(pos, ammo_size, ammo_rockets, true, false);
+			DrawAmmoItem(pos, ammo_size, RESOURCE_ROCKETS, true, false);
 		}
 		else
 		{
 			DrawAmmoItem(
 				pos,
 				ammo_size,
-				wep.ammo_field,
+				wep.ammo_type,
 				true,
 				infinite_ammo
 			);
@@ -206,16 +206,16 @@ void HUD_Ammo()
 	}
 	else
 	{
-		.int ammotype;
+		int ammotype;
 		row = column = 0;
 		for(i = 0; i < AMMO_COUNT; ++i)
 		{
-			ammotype = GetAmmoFieldFromNum(i);
+			ammotype = GetAmmoTypeFromNum(i);
 			DrawAmmoItem(
 				pos + vec2(column * (ammo_size.x + offset.x), row * (ammo_size.y + offset.y)),
 				ammo_size,
 				ammotype,
-				(wep.ammo_field == ammotype),
+				(wep.ammo_type == ammotype),
 				infinite_ammo
 			);