Rename zero_ammo to ammo_none

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 3c7617b3509b062bff3052eac3f3224aa3089b6e..4a73ee9f48e0053b37c44c3601214441eb6991a8 100644 (file)
--- 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 3bda4114f3d9f09e817f57744d2ca8896a520278..a28faea7543b1453e3c0fdc2a9f5fef00ce6feb4 100644 (file)
--- 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 503fdde316dc70b1808b818f200f12e9167e9f24..d6e92a53728203ff5f648e797e2304e00a652fc1 100644 (file)
--- 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 9849c37db5a25698fad0ae81d9e5c05352fcc7f5..4a7978808319109c2d2de1f7f61d652b512e168a 100644 (file)
--- 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?