remove the wish_reload system again

diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index 864dd77fce788cc1696e7bbdee82ac3309748a89..6a28a1154d91ac9769ce54f0ea2f8b92176b5ef5 100644 (file)
--- a/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@ -1,6 +1,6 @@
 void W_Reload()
 {
-    self.wish_reload = 1;
+    weapon_action(self.weapon, WR_RELOAD);
 }
 
 // switch between weapons

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 06d0a3bf5714459a5518c5b90d6c3a12d48e8d45..10f6763fb530eb199c8394b1edf2c52306abd44f 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -615,7 +615,6 @@ float client_cefc_accumulatortime;
 .float clip_load;
 .float old_clip_load;
 .float clip_size;
-.float wish_reload;
 
 // weapon load persistence, for weapons that support reloading
 .float laser_load;

diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc
index 255aa43304d693955cd01ffa0a8abae5dcb67ab7..e4f488168eae87b8598f56f9c61afe4e9852ce56 100644 (file)
--- a/qcsrc/server/w_crylink.qc
+++ b/qcsrc/server/w_crylink.qc
@@ -651,17 +651,6 @@ float w_crylink(float req)
                                }
                        }
                }
-        if(self.wish_reload)
-        {
-            if(self.switchweapon == self.weapon)
-            {
-                if(self.weaponentity.state == WS_READY)
-                {
-                    self.wish_reload = 0;
-                    W_Crylink_Reload();
-                }
-            }
-        }
        }
        else if (req == WR_PRECACHE)
        {

diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index 686e18021e0d0b6e47e4bafe8e52ff13abe9792c..cdc8c97e2d91673b36b009b5a46f4898fcbb995d 100644 (file)
--- a/qcsrc/server/w_electro.qc
+++ b/qcsrc/server/w_electro.qc
@@ -526,18 +526,6 @@ float w_electro(float req)
                                }
                        }
                }
-
-        if(self.wish_reload)
-        {
-            if(self.switchweapon == self.weapon)
-            {
-                if(self.weaponentity.state == WS_READY)
-                {
-                    self.wish_reload = 0;
-                    W_Electro_Reload();
-                }
-            }
-        }
        }
        else if (req == WR_PRECACHE)
        {

diff --git a/qcsrc/server/w_fireball.qc b/qcsrc/server/w_fireball.qc
index aab2db71bf4ea3041db43307f43a98fc0cc42beb..54743e536e6f0e99b9d0b41c45db17ef6f5f907b 100644 (file)
--- a/qcsrc/server/w_fireball.qc
+++ b/qcsrc/server/w_fireball.qc
@@ -421,17 +421,6 @@ float w_fireball(float req)
                                weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_fireball_secondary_animtime, w_ready);
                        }
                }
-        if(self.wish_reload)
-        {
-            if(self.switchweapon == self.weapon)
-            {
-                if(self.weaponentity.state == WS_READY)
-                {
-                    self.wish_reload = 0;
-                    W_Fireball_Reload();
-                }
-            }
-        }
        }
        else if (req == WR_PRECACHE)
        {

diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc
index 39f99f009f5922de24d1da32036f24dd7f374b23..47698e429149ad333cb07755356764537a5e8917 100644 (file)
--- a/qcsrc/server/w_grenadelauncher.qc
+++ b/qcsrc/server/w_grenadelauncher.qc
@@ -389,17 +389,6 @@ float w_glauncher(float req)
                                weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_grenadelauncher_secondary_animtime, w_ready);
                        }
                }
-        if(self.wish_reload)
-        {
-            if(self.switchweapon == self.weapon)
-            {
-                if(self.weaponentity.state == WS_READY)
-                {
-                    self.wish_reload = 0;
-                    W_GrenadeLauncher_Reload();
-                }
-            }
-        }
        }
        else if (req == WR_PRECACHE)
        {

diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc
index f16183021d36cec19bb6e928f47c9c50d1e9bcf7..00dec6033bf6633cebf79b6b04a1da28391dd618 100644 (file)
--- a/qcsrc/server/w_hagar.qc
+++ b/qcsrc/server/w_hagar.qc
@@ -220,17 +220,6 @@ float w_hagar(float req)
                                weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_hagar_secondary_refire, w_ready);
                        }
                }
-        if(self.wish_reload)
-        {
-            if(self.switchweapon == self.weapon)
-            {
-                if(self.weaponentity.state == WS_READY)
-                {
-                    self.wish_reload = 0;
-                    W_Hagar_Reload();
-                }
-            }
-        }
        }
        else if (req == WR_PRECACHE)
        {

diff --git a/qcsrc/server/w_hlac.qc b/qcsrc/server/w_hlac.qc
index a30136da5f03848fb5deb395d5cedab3ed2a8356..9090d41e5b0aa0a7d1f02dedc6ad10b460e901af 100644 (file)
--- a/qcsrc/server/w_hlac.qc
+++ b/qcsrc/server/w_hlac.qc
@@ -258,17 +258,6 @@ float w_hlac(float req)
                                weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_hlac_secondary_animtime, w_ready);
                        }
                }
-        if(self.wish_reload)
-        {
-            if(self.switchweapon == self.weapon)
-            {
-                if(self.weaponentity.state == WS_READY)
-                {
-                    self.wish_reload = 0;
-                    W_HLAC_Reload();
-                }
-            }
-        }
        }
        else if (req == WR_PRECACHE)
        {

diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc
index 33a9c164d42793fc16d15be54b8b933b44c553a5..7d2ac54448e60a68d01463d07dde1c1b78df45a3 100644 (file)
--- a/qcsrc/server/w_laser.qc
+++ b/qcsrc/server/w_laser.qc
@@ -317,17 +317,6 @@ float w_laser(float req)
                                        W_SwitchWeapon (self.cnt);
                        }
                }
-        if(self.wish_reload)
-        {
-            if(self.switchweapon == self.weapon)
-            {
-                if(self.weaponentity.state == WS_READY)
-                {
-                    self.wish_reload = 0;
-                    W_Laser_Reload();
-                }
-            }
-        }
        }
        else if (req == WR_PRECACHE)
        {

diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc
index e64f0c0d7896f5f0879e9fbb084633bfdaef2779..7b08c2e4fefc095b91c3dc25b0810a25e30a0b77 100644 (file)
--- a/qcsrc/server/w_minelayer.qc
+++ b/qcsrc/server/w_minelayer.qc
@@ -455,18 +455,6 @@ float w_minelayer(float req)
                        if(minfound)
                                sound (self, CHAN_WEAPON2, "weapons/mine_det.wav", VOL_BASE, ATTN_NORM);
                }
-
-        if(self.wish_reload)
-        {
-            if(self.switchweapon == self.weapon)
-            {
-                if(self.weaponentity.state == WS_READY)
-                {
-                    self.wish_reload = 0;
-                    W_MineLayer_Reload();
-                }
-            }
-        }
        }
        else if (req == WR_PRECACHE)
        {

diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index 54984a1321a1e2156b390ce377d61d10a10957a8..32d299b5308ce1aa4b5e4a697ea2ffceb9e8ec4e 100644 (file)
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -294,17 +294,6 @@ float w_minstanex(float req)
                                self.weapon = w;
                        }
                }
-        if(self.wish_reload)
-        {
-            if(self.switchweapon == self.weapon)
-            {
-                if(self.weaponentity.state == WS_READY)
-                {
-                    self.wish_reload = 0;
-                    W_Minstanex_Reload();
-                }
-            }
-        }
        }
        else if (req == WR_PRECACHE)
        {

diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index b57214defe2d0e0238bf38403c324a39ecb03223..6a66d9a804736eaef9d07a2f8bca86ea5448e829 100644 (file)
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -265,18 +265,6 @@ float w_nex(float req)
                                self.weaponentity_glowmod_z = self.weaponentity_glowmod_z + autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_blue_full * (self.nex_charge - autocvar_g_balance_nex_charge_limit) / (1 - autocvar_g_balance_nex_charge_limit);
                        }
                }
-
-        if(self.wish_reload)
-        {
-            if(self.switchweapon == self.weapon)
-            {
-                if(self.weaponentity.state == WS_READY)
-                {
-                    self.wish_reload = 0;
-                    W_Nex_Reload();
-                }
-            }
-        }
        }
        else if (req == WR_PRECACHE)
        {

diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc
index 39a04e490a5da99ed69c06e4a93f2bdc2327a4c1..37b4ba6d450841f2e4b1f18ed058e018c11833dd 100644 (file)
--- a/qcsrc/server/w_rocketlauncher.qc
+++ b/qcsrc/server/w_rocketlauncher.qc
@@ -497,17 +497,6 @@ float w_rlauncher(float req)
                                        sound (self, CHAN_WEAPON2, "weapons/rocket_det.wav", VOL_BASE, ATTN_NORM);
                        }
                }
-        if(self.wish_reload)
-        {
-            if(self.switchweapon == self.weapon)
-            {
-                if(self.weaponentity.state == WS_READY)
-                {
-                    self.wish_reload = 0;
-                    W_RocketLauncher_Reload();
-                }
-            }
-        }
        }
        else if (req == WR_PRECACHE)
        {

diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc
index 47e161fd007fac2b6532fa2934e231f1d79fb363..361c1e99687eaa60549b70856e339a474d700cbf 100644 (file)
--- a/qcsrc/server/w_seeker.qc
+++ b/qcsrc/server/w_seeker.qc
@@ -519,18 +519,6 @@ float w_seeker(float req)
                                weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_seeker_flac_animtime, w_ready);
                        }
                }
-
-        if(self.wish_reload)
-        {
-            if(self.switchweapon == self.weapon)
-            {
-                if(self.weaponentity.state == WS_READY)
-                {
-                    self.wish_reload = 0;
-                    W_Seeker_Reload();
-                }
-            }
-        }
        }
        else if (req == WR_PRECACHE)
        {

diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index 569916a298e5cf3524a76b160dbd7f0abb11ad1a..a691386b5ec4ec4a7d5e37b58e199344d1fbbd4c 100644 (file)
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -195,17 +195,6 @@ float w_shotgun(float req)
                                weapon_thinkf(WFRAME_FIRE1, 0, W_Shotgun_Attack2);
                        }
                }
-        if(self.wish_reload)
-        {
-            if(self.switchweapon == self.weapon)
-            {
-                if(self.weaponentity.state == WS_READY)
-                {
-                    self.wish_reload = 0;
-                    W_Shotgun_Reload();
-                }
-            }
-        }
        }
        else if (req == WR_PRECACHE)
        {

diff --git a/qcsrc/server/w_sniperrifle.qc b/qcsrc/server/w_sniperrifle.qc
index d86a3287014bf5acb67262578258388375165a34..500773925a775371f17f95c46762c6af8a5da3f9 100644 (file)
--- a/qcsrc/server/w_sniperrifle.qc
+++ b/qcsrc/server/w_sniperrifle.qc
@@ -229,17 +229,6 @@ float w_sniperrifle(float req)
                                }
                        }
                }
-        if(self.wish_reload)
-        {
-            if(self.switchweapon == self.weapon)
-            {
-                if(self.weaponentity.state == WS_READY)
-                {
-                    self.wish_reload = 0;
-                    W_SniperRifle_Reload();
-                }
-            }
-        }
        }
        else if (req == WR_PRECACHE)
        {

diff --git a/qcsrc/server/w_uzi.qc b/qcsrc/server/w_uzi.qc
index eaa4442a2d05e115540a394996564ec7bd76da22..92fa62bd8d538abff232434c7de21b7ea6c4a0f8 100644 (file)
--- a/qcsrc/server/w_uzi.qc
+++ b/qcsrc/server/w_uzi.qc
@@ -322,17 +322,6 @@ float w_uzi(float req)
                                weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_uzi_first_refire, w_ready);
                        }
                }
-        if(self.wish_reload)
-        {
-            if(self.switchweapon == self.weapon)
-            {
-                if(self.weaponentity.state == WS_READY)
-                {
-                    self.wish_reload = 0;
-                    W_UZI_Reload();
-                }
-            }
-        }
        }
        else if (req == WR_PRECACHE)
        {