From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 11 Feb 2011 17:07:35 +0000 (+0200)
Subject: Rename zero_ammo to ammo_none
X-Git-Tag: xonotic-v0.5.0~309^2~7^2~48
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=b26e1e4ce450e9b24db6b833bdf55cbda6e3b568

Rename zero_ammo to ammo_none
---

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 3c7617b350..4a73ee9f48 100644
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -617,7 +617,7 @@ float client_cefc_accumulatortime;
 ..float current_ammo;
 
 .float weapon_load[WEP_MAXCOUNT]; FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(weapon_load);
-.float zero_ammo; // used by the reloading system, must always be 0
+.float ammo_none; // used by the reloading system, must always be 0
 .float clip_load;
 .float old_clip_load;
 .float clip_size;
diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc
index 3bda4114f3..a28faea754 100644
--- a/qcsrc/server/w_laser.qc
+++ b/qcsrc/server/w_laser.qc
@@ -232,7 +232,7 @@ float w_laser(float req)
 		{
 			if (weapon_prepareattack(0, autocvar_g_balance_laser_primary_refire))
 			{
-				W_DecreaseAmmo(zero_ammo, 1, TRUE);
+				W_DecreaseAmmo(ammo_none, 1, TRUE);
 
 				W_Laser_Attack(0);
 				weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_laser_primary_animtime, w_ready);
@@ -242,7 +242,7 @@ float w_laser(float req)
 		{
 			if(autocvar_g_balance_laser_secondary)
 			{
-				W_DecreaseAmmo(zero_ammo, 1, TRUE);
+				W_DecreaseAmmo(ammo_none, 1, TRUE);
 
 				if (weapon_prepareattack(0, 0))
 				{
@@ -269,7 +269,7 @@ float w_laser(float req)
 	else if (req == WR_SETUP)
 	{
 		weapon_setup(WEP_LASER);
-		self.current_ammo = zero_ammo;
+		self.current_ammo = ammo_none;
 	}
 	else if (req == WR_CHECKAMMO1)
 	{
diff --git a/qcsrc/server/w_porto.qc b/qcsrc/server/w_porto.qc
index 503fdde316..d6e92a5372 100644
--- a/qcsrc/server/w_porto.qc
+++ b/qcsrc/server/w_porto.qc
@@ -272,7 +272,7 @@ float w_porto(float req)
 	else if (req == WR_SETUP)
 	{
 		weapon_setup(WEP_PORTO);
-		self.current_ammo = zero_ammo;
+		self.current_ammo = ammo_none;
 	}
 	else if (req == WR_RESETPLAYER)
 	{
diff --git a/qcsrc/server/w_tuba.qc b/qcsrc/server/w_tuba.qc
index 9849c37db5..4a79788083 100644
--- a/qcsrc/server/w_tuba.qc
+++ b/qcsrc/server/w_tuba.qc
@@ -238,7 +238,7 @@ float w_tuba(float req)
 	else if (req == WR_SETUP)
 	{
 		weapon_setup(WEP_TUBA);
-		self.current_ammo = zero_ammo;
+		self.current_ammo = ammo_none;
 	}
 	else if (req == WR_CHECKAMMO1)
 		return TRUE; // TODO use fuel?