From 334b02bb1a92878459c50b91335b3ebc2192e8a4 Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Mon, 24 Jan 2011 02:33:03 +0200 Subject: [PATCH] Remove a useless cvar check. If reloading is disabled, the weapon load is always 0, so no need to check the cvar itself. --- qcsrc/server/w_crylink.qc | 4 ++-- qcsrc/server/w_electro.qc | 2 +- qcsrc/server/w_fireball.qc | 4 ++-- qcsrc/server/w_grenadelauncher.qc | 4 ++-- qcsrc/server/w_hagar.qc | 4 ++-- qcsrc/server/w_hlac.qc | 4 ++-- qcsrc/server/w_minstanex.qc | 4 ++-- qcsrc/server/w_nex.qc | 2 +- qcsrc/server/w_seeker.qc | 4 ++-- qcsrc/server/w_shotgun.qc | 2 +- qcsrc/server/w_sniperrifle.qc | 4 ++-- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc index d45edbbed..e42902078 100644 --- a/qcsrc/server/w_crylink.qc +++ b/qcsrc/server/w_crylink.qc @@ -677,7 +677,7 @@ float w_crylink(float req) return TRUE; ammo_amount = self.ammo_cells >= autocvar_g_balance_crylink_primary_ammo; - ammo_amount += (autocvar_g_balance_crylink_reload_ammo && self.crylink_load >= autocvar_g_balance_crylink_primary_ammo); + ammo_amount += self.crylink_load >= autocvar_g_balance_crylink_primary_ammo; return ammo_amount; } else if (req == WR_CHECKAMMO2) @@ -687,7 +687,7 @@ float w_crylink(float req) return TRUE; ammo_amount = self.ammo_cells >= autocvar_g_balance_crylink_secondary_ammo; - ammo_amount += (autocvar_g_balance_crylink_reload_ammo && self.crylink_load >= autocvar_g_balance_crylink_secondary_ammo); + ammo_amount += self.crylink_load >= autocvar_g_balance_crylink_secondary_ammo; return ammo_amount; } else if (req == WR_RESETPLAYER) diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc index 154e7275c..295239150 100644 --- a/qcsrc/server/w_electro.qc +++ b/qcsrc/server/w_electro.qc @@ -569,7 +569,7 @@ float w_electro(float req) else if (req == WR_CHECKAMMO2) { ammo_amount = self.ammo_cells >= autocvar_g_balance_electro_secondary_ammo; - ammo_amount += (autocvar_g_balance_electro_reload_ammo && self.electro_load >= autocvar_g_balance_electro_secondary_ammo); + ammo_amount += self.electro_load >= autocvar_g_balance_electro_secondary_ammo; return ammo_amount; } else if (req == WR_RESETPLAYER) diff --git a/qcsrc/server/w_fireball.qc b/qcsrc/server/w_fireball.qc index 686a727cf..64ea41d3e 100644 --- a/qcsrc/server/w_fireball.qc +++ b/qcsrc/server/w_fireball.qc @@ -444,13 +444,13 @@ float w_fireball(float req) else if (req == WR_CHECKAMMO1) { ammo_amount = self.ammo_fuel >= autocvar_g_balance_fireball_primary_ammo; - ammo_amount += (autocvar_g_balance_fireball_reload_ammo && self.fireball_load >= autocvar_g_balance_fireball_primary_ammo); + ammo_amount += self.fireball_load >= autocvar_g_balance_fireball_primary_ammo; return ammo_amount; } else if (req == WR_CHECKAMMO2) { ammo_amount = self.ammo_fuel >= autocvar_g_balance_fireball_secondary_ammo; - ammo_amount += (autocvar_g_balance_fireball_reload_ammo && self.fireball_load >= autocvar_g_balance_fireball_secondary_ammo); + ammo_amount += self.fireball_load >= autocvar_g_balance_fireball_secondary_ammo; return ammo_amount; } else if (req == WR_RESETPLAYER) diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc index 1d039d5f9..4d255bd1c 100644 --- a/qcsrc/server/w_grenadelauncher.qc +++ b/qcsrc/server/w_grenadelauncher.qc @@ -416,13 +416,13 @@ float w_glauncher(float req) else if (req == WR_CHECKAMMO1) { ammo_amount = self.ammo_rockets >= autocvar_g_balance_grenadelauncher_primary_ammo; - ammo_amount += (autocvar_g_balance_grenadelauncher_reload_ammo && self.grenadelauncher_load >= autocvar_g_balance_grenadelauncher_primary_ammo); + ammo_amount += self.grenadelauncher_load >= autocvar_g_balance_grenadelauncher_primary_ammo; return ammo_amount; } else if (req == WR_CHECKAMMO2) { ammo_amount = self.ammo_rockets >= autocvar_g_balance_grenadelauncher_secondary_ammo; - ammo_amount += (autocvar_g_balance_grenadelauncher_reload_ammo && self.grenadelauncher_load >= autocvar_g_balance_grenadelauncher_secondary_ammo); + ammo_amount += self.grenadelauncher_load >= autocvar_g_balance_grenadelauncher_secondary_ammo; return ammo_amount; } else if (req == WR_RESETPLAYER) diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc index 7ad6ee210..25c033b89 100644 --- a/qcsrc/server/w_hagar.qc +++ b/qcsrc/server/w_hagar.qc @@ -240,13 +240,13 @@ float w_hagar(float req) else if (req == WR_CHECKAMMO1) { ammo_amount = self.ammo_rockets >= autocvar_g_balance_hagar_primary_ammo; - ammo_amount += (autocvar_g_balance_hagar_reload_ammo && self.hagar_load >= autocvar_g_balance_hagar_primary_ammo); + ammo_amount += self.hagar_load >= autocvar_g_balance_hagar_primary_ammo; return ammo_amount; } else if (req == WR_CHECKAMMO2) { ammo_amount = self.ammo_rockets >= autocvar_g_balance_hagar_secondary_ammo; - ammo_amount += (autocvar_g_balance_hagar_reload_ammo && self.hagar_load >= autocvar_g_balance_hagar_secondary_ammo); + ammo_amount += self.hagar_load >= autocvar_g_balance_hagar_secondary_ammo; return ammo_amount; } else if (req == WR_RESETPLAYER) diff --git a/qcsrc/server/w_hlac.qc b/qcsrc/server/w_hlac.qc index 2344f66bf..ddfe763be 100644 --- a/qcsrc/server/w_hlac.qc +++ b/qcsrc/server/w_hlac.qc @@ -279,13 +279,13 @@ float w_hlac(float req) else if (req == WR_CHECKAMMO1) { ammo_amount = self.ammo_cells >= autocvar_g_balance_hlac_primary_ammo; - ammo_amount += (autocvar_g_balance_hlac_reload_ammo && self.hlac_load >= autocvar_g_balance_hlac_primary_ammo); + ammo_amount += self.hlac_load >= autocvar_g_balance_hlac_primary_ammo; return ammo_amount; } else if (req == WR_CHECKAMMO2) { ammo_amount = self.ammo_cells >= autocvar_g_balance_hlac_secondary_ammo; - ammo_amount += (autocvar_g_balance_hlac_reload_ammo && self.hlac_load >= autocvar_g_balance_hlac_secondary_ammo); + ammo_amount += self.hlac_load >= autocvar_g_balance_hlac_secondary_ammo; return ammo_amount; } else if (req == WR_RESETPLAYER) diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc index 721fbe42e..9d4bdec4b 100644 --- a/qcsrc/server/w_minstanex.qc +++ b/qcsrc/server/w_minstanex.qc @@ -320,7 +320,7 @@ float w_minstanex(float req) else if (req == WR_CHECKAMMO1) { ammo_amount = self.ammo_cells >= autocvar_g_balance_minstanex_ammo; - ammo_amount += (autocvar_g_balance_minstanex_reload_ammo && self.minstanex_load >= autocvar_g_balance_minstanex_ammo); + ammo_amount += self.minstanex_load >= autocvar_g_balance_minstanex_ammo; return ammo_amount; } else if (req == WR_CHECKAMMO2) @@ -328,7 +328,7 @@ float w_minstanex(float req) if(!autocvar_g_balance_minstanex_laser_ammo) return TRUE; ammo_amount = self.ammo_cells >= autocvar_g_balance_minstanex_laser_ammo; - ammo_amount += (autocvar_g_balance_minstanex_reload_ammo && self.minstanex_load >= autocvar_g_balance_minstanex_laser_ammo); + ammo_amount += self.minstanex_load >= autocvar_g_balance_minstanex_laser_ammo; return ammo_amount; } else if (req == WR_RESETPLAYER) diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc index a27cffadc..6cf6e3df5 100644 --- a/qcsrc/server/w_nex.qc +++ b/qcsrc/server/w_nex.qc @@ -297,7 +297,7 @@ float w_nex(float req) { // don't allow charging if we don't have enough ammo ammo_amount = self.ammo_cells >= autocvar_g_balance_nex_secondary_ammo; - ammo_amount += (autocvar_g_balance_nex_reload_ammo && self.nex_load >= autocvar_g_balance_nex_secondary_ammo); + ammo_amount += self.nex_load >= autocvar_g_balance_nex_secondary_ammo; return ammo_amount; } else if (req == WR_RESETPLAYER) diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc index 9e02e2eca..0fdfaafb3 100644 --- a/qcsrc/server/w_seeker.qc +++ b/qcsrc/server/w_seeker.qc @@ -541,13 +541,13 @@ float w_seeker(float req) else if (req == WR_CHECKAMMO1) { ammo_amount = self.ammo_cells >= autocvar_g_balance_seeker_missile_ammo; - ammo_amount += (autocvar_g_balance_seeker_reload_ammo && self.seeker_load >= autocvar_g_balance_seeker_missile_ammo); + ammo_amount += self.seeker_load >= autocvar_g_balance_seeker_missile_ammo; return ammo_amount; } else if (req == WR_CHECKAMMO2) { ammo_amount = self.ammo_cells >= autocvar_g_balance_seeker_flac_ammo; - ammo_amount += (autocvar_g_balance_seeker_reload_ammo && self.seeker_load >= autocvar_g_balance_seeker_flac_ammo); + ammo_amount += self.seeker_load >= autocvar_g_balance_seeker_flac_ammo; return ammo_amount; } else if (req == WR_RESETPLAYER) diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc index 3f5a91ede..ad790eb92 100644 --- a/qcsrc/server/w_shotgun.qc +++ b/qcsrc/server/w_shotgun.qc @@ -222,7 +222,7 @@ float w_shotgun(float req) else if (req == WR_CHECKAMMO1) { ammo_amount = self.ammo_shells >= autocvar_g_balance_shotgun_primary_ammo; - ammo_amount += (autocvar_g_balance_shotgun_reload_ammo && self.shotgun_load >= autocvar_g_balance_shotgun_primary_ammo); + ammo_amount += self.shotgun_load >= autocvar_g_balance_shotgun_primary_ammo; return ammo_amount; } else if (req == WR_CHECKAMMO2) diff --git a/qcsrc/server/w_sniperrifle.qc b/qcsrc/server/w_sniperrifle.qc index 3e2d3a665..523cab74e 100644 --- a/qcsrc/server/w_sniperrifle.qc +++ b/qcsrc/server/w_sniperrifle.qc @@ -250,13 +250,13 @@ float w_sniperrifle(float req) else if (req == WR_CHECKAMMO1) { ammo_amount = self.ammo_cells >= autocvar_g_balance_sniperrifle_primary_ammo; - ammo_amount += (autocvar_g_balance_sniperrifle_reload_ammo && self.sniperrifle_load >= autocvar_g_balance_sniperrifle_primary_ammo); + ammo_amount += self.sniperrifle_load >= autocvar_g_balance_sniperrifle_primary_ammo; return ammo_amount; } else if (req == WR_CHECKAMMO2) { ammo_amount = self.ammo_cells >= autocvar_g_balance_sniperrifle_secondary_ammo; - ammo_amount += (autocvar_g_balance_sniperrifle_reload_ammo && self.sniperrifle_load >= autocvar_g_balance_sniperrifle_secondary_ammo); + ammo_amount += self.sniperrifle_load >= autocvar_g_balance_sniperrifle_secondary_ammo; return ammo_amount; } else if (req == WR_RESETPLAYER) -- 2.39.2