Stop sending ammo type in W_Reload, now that we update self.current_ammo in WR_SETUP...

diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc
index cea3c92fcaf0044245612b1977b6b2f37cfb388a..c04bbd25776393277fdd44ecada1389069073cbb 100644 (file)
--- a/qcsrc/server/cl_weaponsystem.qc
+++ b/qcsrc/server/cl_weaponsystem.qc
@@ -1717,9 +1717,8 @@ void W_ReloadStart()
        self.clip_load = -1;
 }
 
-void W_Reload(.float sent_ammo_player, float sent_ammo_min, float sent_ammo_amount, float sent_time, string sent_sound)
+void W_Reload(float sent_ammo_min, float sent_ammo_amount, float sent_time, string sent_sound)
 {
-       //self.current_ammo = sent_ammo_player;
        self.reload_ammo_min = sent_ammo_min;
        self.reload_ammo_amount = sent_ammo_amount;
        self.reload_time = sent_time;

diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc
index 4109807753dd763c8e38d2d866d007502ae05e66..974e5a94bd8f1540f93d918496cd564cf521b094 100644 (file)
--- a/qcsrc/server/w_crylink.qc
+++ b/qcsrc/server/w_crylink.qc
@@ -625,7 +625,7 @@ float w_crylink(float req)
        }
        else if (req == WR_RELOAD)
        {
-               W_Reload(ammo_cells, min(autocvar_g_balance_crylink_primary_ammo, autocvar_g_balance_crylink_secondary_ammo), autocvar_g_balance_crylink_reload_ammo, autocvar_g_balance_crylink_reload_time, "weapons/reload.wav");
+               W_Reload(min(autocvar_g_balance_crylink_primary_ammo, autocvar_g_balance_crylink_secondary_ammo), autocvar_g_balance_crylink_reload_ammo, autocvar_g_balance_crylink_reload_time, "weapons/reload.wav");
        }
        return TRUE;
 };

diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index 31686c821c6564bc975d473343b5cf1c55b25d16..a9f927db106254697c16e9b25f1c7bc5c811c13c 100644 (file)
--- a/qcsrc/server/w_electro.qc
+++ b/qcsrc/server/w_electro.qc
@@ -525,7 +525,7 @@ float w_electro(float req)
        }
        else if (req == WR_RELOAD)
        {
-               W_Reload(ammo_cells, min(autocvar_g_balance_electro_primary_ammo, autocvar_g_balance_electro_secondary_ammo), autocvar_g_balance_electro_reload_ammo, autocvar_g_balance_electro_reload_time, "weapons/reload.wav");
+               W_Reload(min(autocvar_g_balance_electro_primary_ammo, autocvar_g_balance_electro_secondary_ammo), autocvar_g_balance_electro_reload_ammo, autocvar_g_balance_electro_reload_time, "weapons/reload.wav");
        }
        return TRUE;
 };

diff --git a/qcsrc/server/w_fireball.qc b/qcsrc/server/w_fireball.qc
index 65b944ffe32f2e8ad978898530d1398154a97eb3..e7dec239321fb9a236ed8f6fc66321fa6b527be6 100644 (file)
--- a/qcsrc/server/w_fireball.qc
+++ b/qcsrc/server/w_fireball.qc
@@ -384,7 +384,7 @@ float w_fireball(float req)
                if(self.ammo_fuel < 1)
                        self.ammo_fuel = 0;
 
-               W_Reload(ammo_fuel, min(autocvar_g_balance_fireball_primary_ammo, autocvar_g_balance_fireball_secondary_ammo), autocvar_g_balance_fireball_reload_ammo, autocvar_g_balance_fireball_reload_time, "weapons/reload.wav");
+               W_Reload(min(autocvar_g_balance_fireball_primary_ammo, autocvar_g_balance_fireball_secondary_ammo), autocvar_g_balance_fireball_reload_ammo, autocvar_g_balance_fireball_reload_time, "weapons/reload.wav");
        }
        return TRUE;
 };

diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc
index a50f47d37fc41114d3f7c2176ac9cacf8db3cb13..82cca44909cfe5831308a7cec0cf73268c5fa119 100644 (file)
--- a/qcsrc/server/w_grenadelauncher.qc
+++ b/qcsrc/server/w_grenadelauncher.qc
@@ -352,7 +352,7 @@ float w_glauncher(float req)
        }
        else if (req == WR_RELOAD)
        {
-               W_Reload(ammo_rockets, min(autocvar_g_balance_grenadelauncher_primary_ammo, autocvar_g_balance_grenadelauncher_secondary_ammo), autocvar_g_balance_grenadelauncher_reload_ammo, autocvar_g_balance_grenadelauncher_reload_time, "weapons/reload.wav");
+               W_Reload(min(autocvar_g_balance_grenadelauncher_primary_ammo, autocvar_g_balance_grenadelauncher_secondary_ammo), autocvar_g_balance_grenadelauncher_reload_ammo, autocvar_g_balance_grenadelauncher_reload_time, "weapons/reload.wav");
        }
        return TRUE;
 };

diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc
index 7a6adffa92a2899012a026971e9291bd37998007..92ca4ba0051a4d07c132be1596ac70d63a235bb0 100644 (file)
--- a/qcsrc/server/w_hagar.qc
+++ b/qcsrc/server/w_hagar.qc
@@ -176,7 +176,7 @@ float w_hagar(float req)
        }
        else if (req == WR_RELOAD)
        {
-               W_Reload(ammo_rockets, min(autocvar_g_balance_hagar_primary_ammo, autocvar_g_balance_hagar_secondary_ammo), autocvar_g_balance_hagar_reload_ammo, autocvar_g_balance_hagar_reload_time, "weapons/reload.wav");
+               W_Reload(min(autocvar_g_balance_hagar_primary_ammo, autocvar_g_balance_hagar_secondary_ammo), autocvar_g_balance_hagar_reload_ammo, autocvar_g_balance_hagar_reload_time, "weapons/reload.wav");
        }
        return TRUE;
 };

diff --git a/qcsrc/server/w_hlac.qc b/qcsrc/server/w_hlac.qc
index 1809ab177058d2dda14ca046bbd71e16de22db41..6d579cf482195aa2e6e4bd49ad98aca3129ec261 100644 (file)
--- a/qcsrc/server/w_hlac.qc
+++ b/qcsrc/server/w_hlac.qc
@@ -215,7 +215,7 @@ float w_hlac(float req)
        }
        else if (req == WR_RELOAD)
        {
-               W_Reload(ammo_cells, min(autocvar_g_balance_hlac_primary_ammo, autocvar_g_balance_hlac_secondary_ammo), autocvar_g_balance_hlac_reload_ammo, autocvar_g_balance_hlac_reload_time, "weapons/reload.wav");
+               W_Reload(min(autocvar_g_balance_hlac_primary_ammo, autocvar_g_balance_hlac_secondary_ammo), autocvar_g_balance_hlac_reload_ammo, autocvar_g_balance_hlac_reload_time, "weapons/reload.wav");
        }
        return TRUE;
 };

diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc
index 9ba19f9d50f46c0731f7a03d6c4ab298ea0bd0b9..3bda4114f3d9f09e817f57744d2ca8896a520278 100644 (file)
--- a/qcsrc/server/w_laser.qc
+++ b/qcsrc/server/w_laser.qc
@@ -281,7 +281,7 @@ float w_laser(float req)
        }
        else if (req == WR_RELOAD)
        {
-               W_Reload(zero_ammo, 0, autocvar_g_balance_laser_reload_ammo, autocvar_g_balance_laser_reload_time, "weapons/reload.wav");
+               W_Reload(0, autocvar_g_balance_laser_reload_ammo, autocvar_g_balance_laser_reload_time, "weapons/reload.wav");
        }
        return TRUE;
 };

diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc
index b52493fd511db6158d9d950a168c0a9f6f721a4b..b475989d68cc4929bc2e74b13389ded27c81ed37 100644 (file)
--- a/qcsrc/server/w_minelayer.qc
+++ b/qcsrc/server/w_minelayer.qc
@@ -439,7 +439,7 @@ float w_minelayer(float req)
        }
        else if (req == WR_RELOAD)
        {
-               W_Reload(ammo_rockets, autocvar_g_balance_minelayer_ammo, autocvar_g_balance_minelayer_reload_ammo, autocvar_g_balance_minelayer_reload_time, "weapons/reload.wav");
+               W_Reload(autocvar_g_balance_minelayer_ammo, autocvar_g_balance_minelayer_reload_ammo, autocvar_g_balance_minelayer_reload_time, "weapons/reload.wav");
        }
        return TRUE;
 };

diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index d5dd7d0f60c1b327e6972cb2174863f2ae3b7be8..b826b98543c61639be69a7cb25f2c5c9ddec782a 100644 (file)
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -263,7 +263,7 @@ float w_minstanex(float req)
                else
                        used_ammo = autocvar_g_balance_minstanex_ammo;
 
-               W_Reload(ammo_cells, used_ammo, autocvar_g_balance_minstanex_reload_ammo, autocvar_g_balance_minstanex_reload_time, "weapons/reload.wav");
+               W_Reload(used_ammo, autocvar_g_balance_minstanex_reload_ammo, autocvar_g_balance_minstanex_reload_time, "weapons/reload.wav");
        }
        return TRUE;
 };

diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index 670d8a3eb0c57deb8abc4b9e5cef0ec5a86ee889..482e216dfc5e2702377be8eeb8c4060ec5b25589 100644 (file)
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -237,7 +237,7 @@ float w_nex(float req)
        }
        else if (req == WR_RELOAD)
        {
-               W_Reload(ammo_cells, min(autocvar_g_balance_nex_primary_ammo, autocvar_g_balance_nex_secondary_ammo), autocvar_g_balance_nex_reload_ammo, autocvar_g_balance_nex_reload_time, "weapons/reload.wav");
+               W_Reload(min(autocvar_g_balance_nex_primary_ammo, autocvar_g_balance_nex_secondary_ammo), autocvar_g_balance_nex_reload_ammo, autocvar_g_balance_nex_reload_time, "weapons/reload.wav");
        }
 
        return TRUE;

diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc
index 8e45a61daf1a0b91597528c6e5b07599747f8260..36dbd8af8d1d1cb25ed5500da38d229021f80266 100644 (file)
--- a/qcsrc/server/w_rocketlauncher.qc
+++ b/qcsrc/server/w_rocketlauncher.qc
@@ -476,7 +476,7 @@ float w_rlauncher(float req)
        }
        else if (req == WR_RELOAD)
        {
-               W_Reload(ammo_rockets, autocvar_g_balance_rocketlauncher_ammo, autocvar_g_balance_rocketlauncher_reload_ammo, autocvar_g_balance_rocketlauncher_reload_time, "weapons/reload.wav");
+               W_Reload(autocvar_g_balance_rocketlauncher_ammo, autocvar_g_balance_rocketlauncher_reload_ammo, autocvar_g_balance_rocketlauncher_reload_time, "weapons/reload.wav");
        }
        return TRUE;
 };

diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc
index cfe7df63457d3914866f3c8e06859e80f9bed039..a08496660015f5e121e8f1d087e0a1e6e04f9994 100644 (file)
--- a/qcsrc/server/w_seeker.qc
+++ b/qcsrc/server/w_seeker.qc
@@ -467,7 +467,7 @@ float w_seeker(float req)
        }
        else if (req == WR_RELOAD)
        {
-               W_Reload(ammo_rockets, min(autocvar_g_balance_seeker_missile_ammo, autocvar_g_balance_seeker_tag_ammo), autocvar_g_balance_seeker_reload_ammo, autocvar_g_balance_seeker_reload_time, "weapons/reload.wav");
+               W_Reload(min(autocvar_g_balance_seeker_missile_ammo, autocvar_g_balance_seeker_tag_ammo), autocvar_g_balance_seeker_reload_ammo, autocvar_g_balance_seeker_reload_time, "weapons/reload.wav");
        }
        return TRUE;
 };

diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index 538e1de27d43de935c0ff2ec25b0ff14db4170eb..38e7fef8d93c9bcc098149e9037af61349a80cef 100644 (file)
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -167,7 +167,7 @@ float w_shotgun(float req)
        }
        else if (req == WR_RELOAD)
        {
-               W_Reload(ammo_shells, autocvar_g_balance_shotgun_primary_ammo, autocvar_g_balance_shotgun_reload_ammo, autocvar_g_balance_shotgun_reload_time, "weapons/reload.wav");
+               W_Reload(autocvar_g_balance_shotgun_primary_ammo, autocvar_g_balance_shotgun_reload_ammo, autocvar_g_balance_shotgun_reload_time, "weapons/reload.wav");
        }
        return TRUE;
 };

diff --git a/qcsrc/server/w_sniperrifle.qc b/qcsrc/server/w_sniperrifle.qc
index deeab0ad06069d3dab31aaec0fa90186134b5609..0b5ae414dc8a33b8774b721fd0c0211ec10459f7 100644 (file)
--- a/qcsrc/server/w_sniperrifle.qc
+++ b/qcsrc/server/w_sniperrifle.qc
@@ -200,7 +200,7 @@ float w_sniperrifle(float req)
        }
        else if (req == WR_RELOAD)
        {
-               W_Reload(ammo_nails, min(autocvar_g_balance_sniperrifle_primary_ammo, autocvar_g_balance_sniperrifle_secondary_ammo), autocvar_g_balance_sniperrifle_reload_ammo, autocvar_g_balance_sniperrifle_reload_time, "weapons/reload.wav");
+               W_Reload(min(autocvar_g_balance_sniperrifle_primary_ammo, autocvar_g_balance_sniperrifle_secondary_ammo), autocvar_g_balance_sniperrifle_reload_ammo, autocvar_g_balance_sniperrifle_reload_time, "weapons/reload.wav");
        }
        return TRUE;
 };

diff --git a/qcsrc/server/w_uzi.qc b/qcsrc/server/w_uzi.qc
index 8903ba81045b3b149393695893a56ecfe469df59..eb9e08b205d1c52f5475c3f65fb429c10fae8486 100644 (file)
--- a/qcsrc/server/w_uzi.qc
+++ b/qcsrc/server/w_uzi.qc
@@ -284,7 +284,7 @@ float w_uzi(float req)
        }
        else if (req == WR_RELOAD)
        {
-               W_Reload(ammo_nails, min(max(autocvar_g_balance_uzi_sustained_ammo, autocvar_g_balance_uzi_first_ammo), autocvar_g_balance_uzi_burst_ammo), autocvar_g_balance_uzi_reload_ammo, autocvar_g_balance_uzi_reload_time, "weapons/reload.wav");
+               W_Reload(min(max(autocvar_g_balance_uzi_sustained_ammo, autocvar_g_balance_uzi_first_ammo), autocvar_g_balance_uzi_burst_ammo), autocvar_g_balance_uzi_reload_ammo, autocvar_g_balance_uzi_reload_time, "weapons/reload.wav");
        }
        return TRUE;
 };