From e1046267f766fb2f7f7d816d9ba175a5ea9fdce6 Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Fri, 21 Jan 2011 23:40:52 +0200 Subject: [PATCH] Remove useless returns on attack and attack2. There are several other checks that keep weapons from firing while reloading, so it won't happen. --- qcsrc/server/w_grenadelauncher.qc | 3 --- qcsrc/server/w_minelayer.qc | 3 --- qcsrc/server/w_shotgun.qc | 3 --- qcsrc/server/w_sniperrifle.qc | 3 --- qcsrc/server/w_uzi.qc | 3 --- 5 files changed, 15 deletions(-) diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc index 055376543e..d252c1f1ca 100644 --- a/qcsrc/server/w_grenadelauncher.qc +++ b/qcsrc/server/w_grenadelauncher.qc @@ -213,9 +213,6 @@ void W_Grenade_Touch2 (void) void W_Grenade_Attack (void) { - if(autocvar_g_balance_grenadelauncher_reload_ammo && self.clip_load <= 0) - return; // reloading, so we are done - local entity gren; W_SetupShot_ProjectileSize (self, '-3 -3 -3', '3 3 3', FALSE, 4, "weapons/grenade_fire.wav", CHAN_WEAPON, autocvar_g_balance_grenadelauncher_primary_damage); diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc index 76b47c6bd7..691eccfe1c 100644 --- a/qcsrc/server/w_minelayer.qc +++ b/qcsrc/server/w_minelayer.qc @@ -249,9 +249,6 @@ void W_Mine_Damage (entity inflictor, entity attacker, float damage, float death void W_Mine_Attack (void) { - if(autocvar_g_balance_minelayer_reload_ammo && self.clip_load <= 0) - return; // reloading, so we are done - entity mine; entity flash; diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc index 2d26b183d2..2bee7080d1 100644 --- a/qcsrc/server/w_shotgun.qc +++ b/qcsrc/server/w_shotgun.qc @@ -69,9 +69,6 @@ void W_Shotgun_Attack (void) float bulletconstant; local entity flash; - if(autocvar_g_balance_shotgun_reload_ammo && self.clip_load <= 0) - return; // reloading, so we are done - ammoamount = autocvar_g_balance_shotgun_primary_ammo; bullets = autocvar_g_balance_shotgun_primary_bullets; d = autocvar_g_balance_shotgun_primary_damage; diff --git a/qcsrc/server/w_sniperrifle.qc b/qcsrc/server/w_sniperrifle.qc index 9df76a9517..469b2db0b1 100644 --- a/qcsrc/server/w_sniperrifle.qc +++ b/qcsrc/server/w_sniperrifle.qc @@ -127,9 +127,6 @@ void W_SniperRifle_BulletHail_Continue() { float r, sw, af; - if(autocvar_g_balance_sniperrifle_reload_ammo && self.clip_load <= 0) - return; // reloading, so we are done - sw = self.switchweapon; // make it not detect weapon changes as reason to abort firing af = ATTACK_FINISHED(self); self.switchweapon = self.weapon; diff --git a/qcsrc/server/w_uzi.qc b/qcsrc/server/w_uzi.qc index 8681c204cd..4693b58422 100644 --- a/qcsrc/server/w_uzi.qc +++ b/qcsrc/server/w_uzi.qc @@ -95,9 +95,6 @@ void UziFlash() void W_Uzi_Attack (float deathtype) { - if(autocvar_g_balance_uzi_reload_ammo && self.clip_load <= 0) - return; // reloading, so we are done - W_SetupShot (self, autocvar_g_antilag_bullets && autocvar_g_balance_uzi_speed >= autocvar_g_antilag_bullets, 0, "weapons/uzi_fire.wav", CHAN_WEAPON, ((self.misc_bulletcounter == 1) ? autocvar_g_balance_uzi_first_damage : autocvar_g_balance_uzi_sustained_damage)); if (!g_norecoil) { -- 2.39.2