From: Mircea Kitsune Date: Sun, 23 Jan 2011 15:07:35 +0000 (+0200) Subject: remove the wish_reload system again X-Git-Tag: xonotic-v0.5.0~309^2~7^2~89 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9ce95d6a4ce7e2d5d55d91c568c30d5abcf22b61;p=xonotic%2Fxonotic-data.pk3dir.git remove the wish_reload system again --- diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc index 864dd77fc..6a28a1154 100644 --- 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 06d0a3bf5..10f6763fb 100644 --- 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 255aa4330..e4f488168 100644 --- 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 686e18021..cdc8c97e2 100644 --- 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 aab2db71b..54743e536 100644 --- 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 39f99f009..47698e429 100644 --- 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 f16183021..00dec6033 100644 --- 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 a30136da5..9090d41e5 100644 --- 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 33a9c164d..7d2ac5444 100644 --- 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 e64f0c0d7..7b08c2e4f 100644 --- 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 54984a132..32d299b53 100644 --- 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 b57214def..6a66d9a80 100644 --- 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 39a04e490..37b4ba6d4 100644 --- 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 47e161fd0..361c1e996 100644 --- 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 569916a29..a691386b5 100644 --- 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 d86a32870..500773925 100644 --- 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 eaa4442a2..92fa62bd8 100644 --- 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) {