From 5b77ec57a68f8753abd9033076795d17fc966d30 Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Sun, 23 Jan 2011 17:46:21 +0200 Subject: [PATCH] Set weapons to fully loaded on respawn in each weapon file instead of cl_client. One more 'weapon list' down. --- qcsrc/server/cl_client.qc | 17 ----------------- qcsrc/server/w_crylink.qc | 5 +++++ qcsrc/server/w_electro.qc | 3 +++ qcsrc/server/w_fireball.qc | 3 +++ qcsrc/server/w_grenadelauncher.qc | 5 +++++ qcsrc/server/w_hagar.qc | 5 +++++ qcsrc/server/w_hlac.qc | 5 +++++ qcsrc/server/w_laser.qc | 11 +++++++++++ qcsrc/server/w_minelayer.qc | 5 +++++ qcsrc/server/w_minstanex.qc | 3 +++ qcsrc/server/w_nex.qc | 5 +++++ qcsrc/server/w_rocketlauncher.qc | 3 +++ qcsrc/server/w_seeker.qc | 5 +++++ qcsrc/server/w_shotgun.qc | 7 ++++++- qcsrc/server/w_sniperrifle.qc | 5 +++++ qcsrc/server/w_uzi.qc | 5 +++++ 16 files changed, 74 insertions(+), 18 deletions(-) diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index 7916e27a3..77d00be41 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -889,23 +889,6 @@ void PutClientInServer (void) self.nex_charge = autocvar_g_balance_nex_charge_start; } - // all weapons must be fully loaded the first time we pick them up, so set their load to maximum at respawn - self.laser_load = autocvar_g_balance_laser_reload_ammo; - self.shotgun_load = autocvar_g_balance_shotgun_reload_ammo; - self.uzi_load = autocvar_g_balance_uzi_reload_ammo; - self.grenadelauncher_load = autocvar_g_balance_grenadelauncher_reload_ammo; - self.minelayer_load = autocvar_g_balance_minelayer_reload_ammo; - self.electro_load = autocvar_g_balance_electro_reload_ammo; - self.crylink_load = autocvar_g_balance_crylink_reload_ammo; - self.hlac_load = autocvar_g_balance_hlac_reload_ammo; - self.nex_load = autocvar_g_balance_nex_reload_ammo; - self.minstanex_load = autocvar_g_balance_minstanex_reload_ammo; - self.sniperrifle_load = autocvar_g_balance_sniperrifle_reload_ammo; - self.seeker_load = autocvar_g_balance_seeker_reload_ammo; - self.hagar_load = autocvar_g_balance_hagar_reload_ammo; - self.fireball_load = autocvar_g_balance_fireball_reload_ammo; - self.rocketlauncher_load = autocvar_g_balance_rocketlauncher_reload_ammo; - if(inWarmupStage) { self.ammo_shells = warmup_start_ammo_shells; diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc index e4f488168..6a823b920 100644 --- a/qcsrc/server/w_crylink.qc +++ b/qcsrc/server/w_crylink.qc @@ -687,6 +687,11 @@ float w_crylink(float req) ammo_amount += (autocvar_g_balance_crylink_reload_ammo && self.crylink_load >= autocvar_g_balance_crylink_secondary_ammo); return ammo_amount; } + else if (req == WR_RESETPLAYER) + { + // all weapons must be fully loaded when we spawn + self.crylink_load = autocvar_g_balance_crylink_reload_ammo; + } else if (req == WR_RELOAD) { W_Crylink_Reload(); diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc index cdc8c97e2..a6edd8f2d 100644 --- a/qcsrc/server/w_electro.qc +++ b/qcsrc/server/w_electro.qc @@ -572,6 +572,9 @@ float w_electro(float req) else if (req == WR_RESETPLAYER) { self.electro_secondarytime = time; + + // all weapons must be fully loaded when we spawn + self.electro_load = autocvar_g_balance_electro_reload_ammo; } else if (req == WR_RELOAD) { diff --git a/qcsrc/server/w_fireball.qc b/qcsrc/server/w_fireball.qc index 54743e536..f8f745a96 100644 --- a/qcsrc/server/w_fireball.qc +++ b/qcsrc/server/w_fireball.qc @@ -453,6 +453,9 @@ float w_fireball(float req) else if (req == WR_RESETPLAYER) { self.fireball_primarytime = time; + + // all weapons must be fully loaded when we spawn + self.fireball_load = autocvar_g_balance_fireball_reload_ammo; } else if (req == WR_RELOAD) { diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc index 47698e429..43ca76474 100644 --- a/qcsrc/server/w_grenadelauncher.qc +++ b/qcsrc/server/w_grenadelauncher.qc @@ -422,6 +422,11 @@ float w_glauncher(float req) ammo_amount += (autocvar_g_balance_grenadelauncher_reload_ammo && self.grenadelauncher_load >= autocvar_g_balance_grenadelauncher_secondary_ammo); return ammo_amount; } + else if (req == WR_RESETPLAYER) + { + // all weapons must be fully loaded when we spawn + self.grenadelauncher_load = autocvar_g_balance_grenadelauncher_reload_ammo; + } else if (req == WR_RELOAD) { W_GrenadeLauncher_Reload(); diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc index 00dec6033..cbc146915 100644 --- a/qcsrc/server/w_hagar.qc +++ b/qcsrc/server/w_hagar.qc @@ -246,6 +246,11 @@ float w_hagar(float req) ammo_amount += (autocvar_g_balance_hagar_reload_ammo && self.hagar_load >= autocvar_g_balance_hagar_secondary_ammo); return ammo_amount; } + else if (req == WR_RESETPLAYER) + { + // all weapons must be fully loaded when we spawn + self.hagar_load = autocvar_g_balance_hagar_reload_ammo; + } else if (req == WR_RELOAD) { W_Hagar_Reload(); diff --git a/qcsrc/server/w_hlac.qc b/qcsrc/server/w_hlac.qc index 9090d41e5..ad12e740d 100644 --- a/qcsrc/server/w_hlac.qc +++ b/qcsrc/server/w_hlac.qc @@ -285,6 +285,11 @@ float w_hlac(float req) ammo_amount += (autocvar_g_balance_hlac_reload_ammo && self.hlac_load >= autocvar_g_balance_hlac_secondary_ammo); return ammo_amount; } + else if (req == WR_RESETPLAYER) + { + // all weapons must be fully loaded when we spawn + self.hlac_load = autocvar_g_balance_hlac_reload_ammo; + } else if (req == WR_RELOAD) { W_HLAC_Reload(); diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc index 7d2ac5444..222feb1c5 100644 --- a/qcsrc/server/w_laser.qc +++ b/qcsrc/server/w_laser.qc @@ -333,11 +333,22 @@ float w_laser(float req) W_Laser_SetAmmoCounter(); } else if (req == WR_CHECKAMMO1) + { return TRUE; + } else if (req == WR_CHECKAMMO2) + { return TRUE; + } + else if (req == WR_RESETPLAYER) + { + // all weapons must be fully loaded when we spawn + self.laser_load = autocvar_g_balance_laser_reload_ammo; + } else if (req == WR_RELOAD) + { W_Laser_Reload(); + } return TRUE; }; #endif diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc index 7b08c2e4f..b8adb65ff 100644 --- a/qcsrc/server/w_minelayer.qc +++ b/qcsrc/server/w_minelayer.qc @@ -490,6 +490,11 @@ float w_minelayer(float req) { return FALSE; } + else if (req == WR_RESETPLAYER) + { + // all weapons must be fully loaded when we spawn + self.minelayer_load = autocvar_g_balance_minelayer_reload_ammo; + } else if (req == WR_RELOAD) { W_MineLayer_Reload(); diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc index 32d299b53..03b072b8d 100644 --- a/qcsrc/server/w_minstanex.qc +++ b/qcsrc/server/w_minstanex.qc @@ -331,6 +331,9 @@ float w_minstanex(float req) else if (req == WR_RESETPLAYER) { self.minstanex_lasthit = 0; + + // all weapons must be fully loaded when we spawn + self.minstanex_load = autocvar_g_balance_minstanex_reload_ammo; } else if (req == WR_RELOAD) { diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc index 6a66d9a80..1210372d1 100644 --- a/qcsrc/server/w_nex.qc +++ b/qcsrc/server/w_nex.qc @@ -297,6 +297,11 @@ float w_nex(float req) ammo_amount += (autocvar_g_balance_nex_reload_ammo && self.nex_load >= autocvar_g_balance_nex_secondary_ammo); return ammo_amount; } + else if (req == WR_RESETPLAYER) + { + // all weapons must be fully loaded when we spawn + self.nex_load = autocvar_g_balance_nex_reload_ammo; + } else if (req == WR_RELOAD) { W_Nex_Reload(); diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc index 37b4ba6d4..85f855e13 100644 --- a/qcsrc/server/w_rocketlauncher.qc +++ b/qcsrc/server/w_rocketlauncher.qc @@ -532,6 +532,9 @@ float w_rlauncher(float req) else if (req == WR_RESETPLAYER) { self.rl_release = 0; + + // all weapons must be fully loaded when we spawn + self.rocketlauncher_load = autocvar_g_balance_rocketlauncher_reload_ammo; } else if (req == WR_RELOAD) { diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc index 361c1e996..a259c74af 100644 --- a/qcsrc/server/w_seeker.qc +++ b/qcsrc/server/w_seeker.qc @@ -547,6 +547,11 @@ float w_seeker(float req) ammo_amount += (autocvar_g_balance_seeker_reload_ammo && self.seeker_load >= autocvar_g_balance_seeker_flac_ammo); return ammo_amount; } + else if (req == WR_RESETPLAYER) + { + // all weapons must be fully loaded when we spawn + self.seeker_load = autocvar_g_balance_seeker_reload_ammo; + } else if (req == WR_RELOAD) { W_Seeker_Reload(); diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc index a691386b5..78060ec7d 100644 --- a/qcsrc/server/w_shotgun.qc +++ b/qcsrc/server/w_shotgun.qc @@ -220,9 +220,14 @@ float w_shotgun(float req) } else if (req == WR_CHECKAMMO2) { - // melee attack must always be available + // melee attack is always available return TRUE; } + else if (req == WR_RESETPLAYER) + { + // all weapons must be fully loaded when we spawn + self.shotgun_load = autocvar_g_balance_shotgun_reload_ammo; + } else if (req == WR_RELOAD) { W_Shotgun_Reload(); diff --git a/qcsrc/server/w_sniperrifle.qc b/qcsrc/server/w_sniperrifle.qc index 500773925..9e016b256 100644 --- a/qcsrc/server/w_sniperrifle.qc +++ b/qcsrc/server/w_sniperrifle.qc @@ -256,6 +256,11 @@ float w_sniperrifle(float req) ammo_amount += (autocvar_g_balance_sniperrifle_reload_ammo && self.sniperrifle_load >= autocvar_g_balance_sniperrifle_secondary_ammo); return ammo_amount; } + else if (req == WR_RESETPLAYER) + { + // all weapons must be fully loaded when we spawn + self.sniperrifle_load = autocvar_g_balance_sniperrifle_reload_ammo; + } else if (req == WR_RELOAD) { W_SniperRifle_Reload(); diff --git a/qcsrc/server/w_uzi.qc b/qcsrc/server/w_uzi.qc index 92fa62bd8..b52a741a3 100644 --- a/qcsrc/server/w_uzi.qc +++ b/qcsrc/server/w_uzi.qc @@ -369,6 +369,11 @@ float w_uzi(float req) } return ammo_amount; } + else if (req == WR_RESETPLAYER) + { + // all weapons must be fully loaded when we spawn + self.uzi_load = autocvar_g_balance_uzi_reload_ammo; + } else if (req == WR_RELOAD) { W_UZI_Reload(); -- 2.39.2