From ce648d750269fc7541af91398921389b4ac65098 Mon Sep 17 00:00:00 2001 From: div0 Date: Tue, 2 Sep 2008 18:46:28 +0000 Subject: [PATCH] weapon_setup no longer needed its second argument, so kill it git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4295 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/cl_client.qc | 1 - data/qcsrc/server/cl_weaponsystem.qc | 2 +- data/qcsrc/server/t_items.qc | 1 - data/qcsrc/server/w_crylink.qc | 2 +- data/qcsrc/server/w_electro.qc | 2 +- data/qcsrc/server/w_grenadelauncher.qc | 2 +- data/qcsrc/server/w_hagar.qc | 2 +- data/qcsrc/server/w_laser.qc | 2 +- data/qcsrc/server/w_nex.qc | 2 +- data/qcsrc/server/w_rocketlauncher.qc | 2 +- data/qcsrc/server/w_shotgun.qc | 2 +- data/qcsrc/server/w_uzi.qc | 2 +- 12 files changed, 10 insertions(+), 12 deletions(-) diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index 15963ee87..791a4c684 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -1031,7 +1031,6 @@ void DecodeLevelParms (void); void ClientConnect (void) { local string s; - float wep; if(self.flags & FL_CLIENT) { diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc index 83587d928..8cdf4bc00 100644 --- a/data/qcsrc/server/cl_weaponsystem.qc +++ b/data/qcsrc/server/cl_weaponsystem.qc @@ -385,7 +385,7 @@ void w_ready() }; // Setup weapon for client (after this raise frame will be launched) -void weapon_setup(float windex, string wname) +void weapon_setup(float windex) { entity e; e = get_weaponinfo(windex); diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc index a3851ef6f..540609113 100644 --- a/data/qcsrc/server/t_items.qc +++ b/data/qcsrc/server/t_items.qc @@ -585,7 +585,6 @@ void spawnfunc_weapon_shotgun (void) { void spawnfunc_weapon_nex (void) { - float nextime; if (g_minstagib) { minstagib_items(IT_CELLS); diff --git a/data/qcsrc/server/w_crylink.qc b/data/qcsrc/server/w_crylink.qc index 3cfb01f02..979dad946 100644 --- a/data/qcsrc/server/w_crylink.qc +++ b/data/qcsrc/server/w_crylink.qc @@ -234,7 +234,7 @@ float w_crylink(float req) precache_sound ("weapons/crylink_fire.wav"); } else if (req == WR_SETUP) - weapon_setup(WEP_CRYLINK, "crylink"); + weapon_setup(WEP_CRYLINK); else if (req == WR_CHECKAMMO1) return self.ammo_cells >= cvar("g_balance_crylink_primary_ammo"); else if (req == WR_CHECKAMMO2) diff --git a/data/qcsrc/server/w_electro.qc b/data/qcsrc/server/w_electro.qc index 174d6da34..2b8142cb6 100644 --- a/data/qcsrc/server/w_electro.qc +++ b/data/qcsrc/server/w_electro.qc @@ -225,7 +225,7 @@ float w_electro(float req) precache_sound ("weapons/electro_impact_combo.wav"); } else if (req == WR_SETUP) - weapon_setup(WEP_ELECTRO, "electro"); + weapon_setup(WEP_ELECTRO); else if (req == WR_CHECKAMMO1) return self.ammo_cells >= cvar("g_balance_electro_primary_ammo"); else if (req == WR_CHECKAMMO2) diff --git a/data/qcsrc/server/w_grenadelauncher.qc b/data/qcsrc/server/w_grenadelauncher.qc index 082ffdd23..af677ff29 100644 --- a/data/qcsrc/server/w_grenadelauncher.qc +++ b/data/qcsrc/server/w_grenadelauncher.qc @@ -248,7 +248,7 @@ float w_glauncher(float req) precache_sound ("weapons/grenade_impact.wav"); } else if (req == WR_SETUP) - weapon_setup(WEP_GRENADE_LAUNCHER, "gl"); + weapon_setup(WEP_GRENADE_LAUNCHER); else if (req == WR_CHECKAMMO1) return self.ammo_rockets >= cvar("g_balance_grenadelauncher_primary_ammo"); else if (req == WR_CHECKAMMO2) diff --git a/data/qcsrc/server/w_hagar.qc b/data/qcsrc/server/w_hagar.qc index abc4c878c..2418a8616 100644 --- a/data/qcsrc/server/w_hagar.qc +++ b/data/qcsrc/server/w_hagar.qc @@ -198,7 +198,7 @@ float w_hagar(float req) precache_sound ("weapons/hagexp3.wav"); } else if (req == WR_SETUP) - weapon_setup(WEP_HAGAR, "hagar"); + weapon_setup(WEP_HAGAR); else if (req == WR_CHECKAMMO1) return self.ammo_rockets >= cvar("g_balance_hagar_primary_ammo"); else if (req == WR_CHECKAMMO2) diff --git a/data/qcsrc/server/w_laser.qc b/data/qcsrc/server/w_laser.qc index cec4cb085..026eae2ed 100644 --- a/data/qcsrc/server/w_laser.qc +++ b/data/qcsrc/server/w_laser.qc @@ -128,7 +128,7 @@ float w_laser(float req) precache_sound ("weapons/laserimpact.wav"); } else if (req == WR_SETUP) - weapon_setup(WEP_LASER, "laser"); + weapon_setup(WEP_LASER); else if (req == WR_CHECKAMMO1) return TRUE; else if (req == WR_CHECKAMMO2) diff --git a/data/qcsrc/server/w_nex.qc b/data/qcsrc/server/w_nex.qc index cdfe8fe36..542f14aa7 100644 --- a/data/qcsrc/server/w_nex.qc +++ b/data/qcsrc/server/w_nex.qc @@ -170,7 +170,7 @@ float w_nex(float req) w_laser(WR_PRECACHE); } else if (req == WR_SETUP) - weapon_setup(WEP_NEX, "nex"); + weapon_setup(WEP_NEX); else if (req == WR_CHECKAMMO1) { if (g_minstagib) diff --git a/data/qcsrc/server/w_rocketlauncher.qc b/data/qcsrc/server/w_rocketlauncher.qc index 4260724ea..c7b17c788 100644 --- a/data/qcsrc/server/w_rocketlauncher.qc +++ b/data/qcsrc/server/w_rocketlauncher.qc @@ -420,7 +420,7 @@ float w_rlauncher(float req) precache_model ("models/laser_dot.mdl"); // rocket launcher } else if (req == WR_SETUP) - weapon_setup(WEP_ROCKET_LAUNCHER, "rl"); + weapon_setup(WEP_ROCKET_LAUNCHER); else if (req == WR_CHECKAMMO1) { // don't switch while guiding a missile diff --git a/data/qcsrc/server/w_shotgun.qc b/data/qcsrc/server/w_shotgun.qc index 65adb1773..d078e22ed 100644 --- a/data/qcsrc/server/w_shotgun.qc +++ b/data/qcsrc/server/w_shotgun.qc @@ -136,7 +136,7 @@ float w_shotgun(float req) precache_model ("models/casing_shell.mdl"); } else if (req == WR_SETUP) - weapon_setup(WEP_SHOTGUN, "shotgun"); + weapon_setup(WEP_SHOTGUN); else if (req == WR_CHECKAMMO1) return self.ammo_shells >= cvar("g_balance_shotgun_primary_ammo"); else if (req == WR_CHECKAMMO2) diff --git a/data/qcsrc/server/w_uzi.qc b/data/qcsrc/server/w_uzi.qc index 70d7e89c9..5351121f3 100644 --- a/data/qcsrc/server/w_uzi.qc +++ b/data/qcsrc/server/w_uzi.qc @@ -144,7 +144,7 @@ float w_uzi(float req) precache_model ("models/casing_bronze.mdl"); } else if (req == WR_SETUP) - weapon_setup(WEP_UZI, "uzi"); + weapon_setup(WEP_UZI); else if (req == WR_CHECKAMMO1) return self.ammo_nails >= cvar("g_balance_uzi_first_ammo"); else if (req == WR_CHECKAMMO2) -- 2.39.2