Set self.current_ammo in each weapon's WR_SETUP stage. That way, this float can be...

diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc
index 222c0f9fdbe8bf9aaf42975045a4140e359b335f..cea3c92fcaf0044245612b1977b6b2f37cfb388a 100644 (file)
--- a/qcsrc/server/cl_weaponsystem.qc
+++ b/qcsrc/server/cl_weaponsystem.qc
@@ -1623,10 +1623,7 @@ void W_DecreaseAmmo(.float ammo_type, float ammo_use, float ammo_reload)
                        self.weapon_load[self.weapon] = self.clip_load;
                }
                else
-               {
-                       self.current_ammo = ammo_type;
                        self.(self.current_ammo) -= ammo_use;
-               }
        }
 }
 
@@ -1722,7 +1719,7 @@ void W_ReloadStart()
 
 void W_Reload(.float sent_ammo_player, float sent_ammo_min, float sent_ammo_amount, float sent_time, string sent_sound)
 {
-       self.current_ammo = sent_ammo_player;
+       //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 a663df0f8e3572ec5049fe19bf83c93c78051e5d..4109807753dd763c8e38d2d866d007502ae05e66 100644 (file)
--- a/qcsrc/server/w_crylink.qc
+++ b/qcsrc/server/w_crylink.qc
@@ -601,6 +601,7 @@ float w_crylink(float req)
        else if (req == WR_SETUP)
        {
                weapon_setup(WEP_CRYLINK);
+               self.current_ammo = ammo_cells;
        }
        else if (req == WR_CHECKAMMO1)
        {

diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index 6fb410019ebaae7e8977e9602ddc6abb95b2aac4..31686c821c6564bc975d473343b5cf1c55b25d16 100644 (file)
--- a/qcsrc/server/w_electro.qc
+++ b/qcsrc/server/w_electro.qc
@@ -494,6 +494,7 @@ float w_electro(float req)
        else if (req == WR_SETUP)
        {
                weapon_setup(WEP_ELECTRO);
+               self.current_ammo = ammo_cells;
        }
        else if (req == WR_CHECKAMMO1)
        {

diff --git a/qcsrc/server/w_fireball.qc b/qcsrc/server/w_fireball.qc
index a269c6556301b663a99a89cbfccec2f78206b178..65b944ffe32f2e8ad978898530d1398154a97eb3 100644 (file)
--- a/qcsrc/server/w_fireball.qc
+++ b/qcsrc/server/w_fireball.qc
@@ -360,6 +360,7 @@ float w_fireball(float req)
        else if (req == WR_SETUP)
        {
                weapon_setup(WEP_FIREBALL);
+               self.current_ammo = ammo_fuel;
        }
        else if (req == WR_CHECKAMMO1)
        {

diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc
index 5ea482a4c55c8560c1d18683347202da1595f529..a50f47d37fc41114d3f7c2176ac9cacf8db3cb13 100644 (file)
--- a/qcsrc/server/w_grenadelauncher.qc
+++ b/qcsrc/server/w_grenadelauncher.qc
@@ -336,6 +336,7 @@ float w_glauncher(float req)
        else if (req == WR_SETUP)
        {
                weapon_setup(WEP_GRENADE_LAUNCHER);
+               self.current_ammo = ammo_rockets;
        }
        else if (req == WR_CHECKAMMO1)
        {

diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc
index cb6fad0039e3f76859371a43d8e2011256a6d78c..7a6adffa92a2899012a026971e9291bd37998007 100644 (file)
--- a/qcsrc/server/w_hagar.qc
+++ b/qcsrc/server/w_hagar.qc
@@ -160,6 +160,7 @@ float w_hagar(float req)
        else if (req == WR_SETUP)
        {
                weapon_setup(WEP_HAGAR);
+               self.current_ammo = ammo_rockets;
        }
        else if (req == WR_CHECKAMMO1)
        {

diff --git a/qcsrc/server/w_hlac.qc b/qcsrc/server/w_hlac.qc
index c1de434ed4a9b4808410c57a8964081a1aaa8fd2..1809ab177058d2dda14ca046bbd71e16de22db41 100644 (file)
--- a/qcsrc/server/w_hlac.qc
+++ b/qcsrc/server/w_hlac.qc
@@ -199,6 +199,7 @@ float w_hlac(float req)
        else if (req == WR_SETUP)
        {
                weapon_setup(WEP_HLAC);
+               self.current_ammo = ammo_cells;
        }
        else if (req == WR_CHECKAMMO1)
        {

diff --git a/qcsrc/server/w_hook.qc b/qcsrc/server/w_hook.qc
index ebf7c24e5f9aa16fc4a375e796130029c28e1071..c3a1768beb0ab9335031a8762284292ca8711cea 100644 (file)
--- a/qcsrc/server/w_hook.qc
+++ b/qcsrc/server/w_hook.qc
@@ -228,6 +228,7 @@ float w_hook(float req)
        else if (req == WR_SETUP)
        {
                weapon_setup(WEP_HOOK);
+               self.current_ammo = ammo_fuel;
                self.hook_state &~= HOOK_WAITING_FOR_RELEASE;
        }
        else if (req == WR_CHECKAMMO1)

diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc
index ad29d442a0566bebc9571c920d0aa4e6eb57defa..9ba19f9d50f46c0731f7a03d6c4ab298ea0bd0b9 100644 (file)
--- a/qcsrc/server/w_laser.qc
+++ b/qcsrc/server/w_laser.qc
@@ -269,6 +269,7 @@ float w_laser(float req)
        else if (req == WR_SETUP)
        {
                weapon_setup(WEP_LASER);
+               self.current_ammo = zero_ammo;
        }
        else if (req == WR_CHECKAMMO1)
        {

diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc
index 3c9aac6cc22090bbad023cb39c930d0f1940b4f4..b52493fd511db6158d9d950a168c0a9f6f721a4b 100644 (file)
--- a/qcsrc/server/w_minelayer.qc
+++ b/qcsrc/server/w_minelayer.qc
@@ -416,6 +416,7 @@ float w_minelayer(float req)
        else if (req == WR_SETUP)
        {
                weapon_setup(WEP_MINE_LAYER);
+               self.current_ammo = ammo_rockets;
        }
        else if (req == WR_CHECKAMMO1)
        {

diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index a15a6b2587f7f948659a6ad0617083d8751df5c8..d5dd7d0f60c1b327e6972cb2174863f2ae3b7be8 100644 (file)
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -234,6 +234,7 @@ float w_minstanex(float req)
        else if (req == WR_SETUP)
        {
                weapon_setup(WEP_MINSTANEX);
+               self.current_ammo = ammo_cells;
                self.minstanex_lasthit = 0;
        }
        else if (req == WR_CHECKAMMO1)

diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index e3f4659c903ad94058f08e2b54e75e0840269f0f..670d8a3eb0c57deb8abc4b9e5cef0ec5a86ee889 100644 (file)
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -220,6 +220,7 @@ float w_nex(float req)
        else if (req == WR_SETUP)
        {
                weapon_setup(WEP_NEX);
+               self.current_ammo = ammo_cells;
        }
        else if (req == WR_CHECKAMMO1)
        {

diff --git a/qcsrc/server/w_porto.qc b/qcsrc/server/w_porto.qc
index 76b5a50729d94b64ad666a28bc97016d01d27d63..503fdde316dc70b1808b818f200f12e9167e9f24 100644 (file)
--- a/qcsrc/server/w_porto.qc
+++ b/qcsrc/server/w_porto.qc
@@ -272,6 +272,7 @@ float w_porto(float req)
        else if (req == WR_SETUP)
        {
                weapon_setup(WEP_PORTO);
+               self.current_ammo = zero_ammo;
        }
        else if (req == WR_RESETPLAYER)
        {

diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc
index c33e0e76488d1c8ae7fa4ea166db5a4723e30cea..8e45a61daf1a0b91597528c6e5b07599747f8260 100644 (file)
--- a/qcsrc/server/w_rocketlauncher.qc
+++ b/qcsrc/server/w_rocketlauncher.qc
@@ -450,6 +450,7 @@ float w_rlauncher(float req)
        else if (req == WR_SETUP)
        {
                weapon_setup(WEP_ROCKET_LAUNCHER);
+               self.current_ammo = ammo_rockets;
                self.rl_release = 1;
        }
        else if (req == WR_CHECKAMMO1)

diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc
index 3659a2ec48e7e4bde37a7856440e1d1bc45b4750..cfe7df63457d3914866f3c8e06859e80f9bed039 100644 (file)
--- a/qcsrc/server/w_seeker.qc
+++ b/qcsrc/server/w_seeker.qc
@@ -451,6 +451,7 @@ float w_seeker(float req)
        else if (req == WR_SETUP)
        {
                weapon_setup(WEP_SEEKER);
+               self.current_ammo = ammo_rockets;
        }
        else if (req == WR_CHECKAMMO1)
        {

diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index f92a3d356ee7c50dad661c8b5fbd46166d2049a9..538e1de27d43de935c0ff2ec25b0ff14db4170eb 100644 (file)
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -152,6 +152,7 @@ float w_shotgun(float req)
        else if (req == WR_SETUP)
        {
                weapon_setup(WEP_SHOTGUN);
+               self.current_ammo = ammo_shells;
        }
        else if (req == WR_CHECKAMMO1)
        {

diff --git a/qcsrc/server/w_sniperrifle.qc b/qcsrc/server/w_sniperrifle.qc
index ec5743d0b1b558d2133d4ae0e9cfcda39ae96711..deeab0ad06069d3dab31aaec0fa90186134b5609 100644 (file)
--- a/qcsrc/server/w_sniperrifle.qc
+++ b/qcsrc/server/w_sniperrifle.qc
@@ -180,6 +180,7 @@ float w_sniperrifle(float req)
        else if (req == WR_SETUP)
        {
                weapon_setup(WEP_SNIPERRIFLE);
+               self.current_ammo = ammo_nails;
        }
        else if (req == WR_CHECKAMMO1)
        {

diff --git a/qcsrc/server/w_tuba.qc b/qcsrc/server/w_tuba.qc
index 00c083956df2cf89b16c9a462b1c523489f54b08..9849c37db5a25698fad0ae81d9e5c05352fcc7f5 100644 (file)
--- a/qcsrc/server/w_tuba.qc
+++ b/qcsrc/server/w_tuba.qc
@@ -238,6 +238,7 @@ float w_tuba(float req)
        else if (req == WR_SETUP)
        {
                weapon_setup(WEP_TUBA);
+               self.current_ammo = zero_ammo;
        }
        else if (req == WR_CHECKAMMO1)
                return TRUE; // TODO use fuel?