r4295 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Tue Sep 2 14:46:28 EDT 2008
Author: div0
Date: 2008-09-02 14:46:28 -0400 (Tue, 02 Sep 2008)
New Revision: 4295
Modified:
trunk/data/qcsrc/server/cl_client.qc
trunk/data/qcsrc/server/cl_weaponsystem.qc
trunk/data/qcsrc/server/t_items.qc
trunk/data/qcsrc/server/w_crylink.qc
trunk/data/qcsrc/server/w_electro.qc
trunk/data/qcsrc/server/w_grenadelauncher.qc
trunk/data/qcsrc/server/w_hagar.qc
trunk/data/qcsrc/server/w_laser.qc
trunk/data/qcsrc/server/w_nex.qc
trunk/data/qcsrc/server/w_rocketlauncher.qc
trunk/data/qcsrc/server/w_shotgun.qc
trunk/data/qcsrc/server/w_uzi.qc
Log:
weapon_setup no longer needed its second argument, so kill it
Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc 2008-09-02 18:43:29 UTC (rev 4294)
+++ trunk/data/qcsrc/server/cl_client.qc 2008-09-02 18:46:28 UTC (rev 4295)
@@ -1031,7 +1031,6 @@
void ClientConnect (void)
{
local string s;
- float wep;
if(self.flags & FL_CLIENT)
{
Modified: trunk/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weaponsystem.qc 2008-09-02 18:43:29 UTC (rev 4294)
+++ trunk/data/qcsrc/server/cl_weaponsystem.qc 2008-09-02 18:46:28 UTC (rev 4295)
@@ -385,7 +385,7 @@
};
// 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);
Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc 2008-09-02 18:43:29 UTC (rev 4294)
+++ trunk/data/qcsrc/server/t_items.qc 2008-09-02 18:46:28 UTC (rev 4295)
@@ -585,7 +585,6 @@
void spawnfunc_weapon_nex (void)
{
- float nextime;
if (g_minstagib)
{
minstagib_items(IT_CELLS);
Modified: trunk/data/qcsrc/server/w_crylink.qc
===================================================================
--- trunk/data/qcsrc/server/w_crylink.qc 2008-09-02 18:43:29 UTC (rev 4294)
+++ trunk/data/qcsrc/server/w_crylink.qc 2008-09-02 18:46:28 UTC (rev 4295)
@@ -234,7 +234,7 @@
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)
Modified: trunk/data/qcsrc/server/w_electro.qc
===================================================================
--- trunk/data/qcsrc/server/w_electro.qc 2008-09-02 18:43:29 UTC (rev 4294)
+++ trunk/data/qcsrc/server/w_electro.qc 2008-09-02 18:46:28 UTC (rev 4295)
@@ -225,7 +225,7 @@
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)
Modified: trunk/data/qcsrc/server/w_grenadelauncher.qc
===================================================================
--- trunk/data/qcsrc/server/w_grenadelauncher.qc 2008-09-02 18:43:29 UTC (rev 4294)
+++ trunk/data/qcsrc/server/w_grenadelauncher.qc 2008-09-02 18:46:28 UTC (rev 4295)
@@ -248,7 +248,7 @@
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)
Modified: trunk/data/qcsrc/server/w_hagar.qc
===================================================================
--- trunk/data/qcsrc/server/w_hagar.qc 2008-09-02 18:43:29 UTC (rev 4294)
+++ trunk/data/qcsrc/server/w_hagar.qc 2008-09-02 18:46:28 UTC (rev 4295)
@@ -198,7 +198,7 @@
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)
Modified: trunk/data/qcsrc/server/w_laser.qc
===================================================================
--- trunk/data/qcsrc/server/w_laser.qc 2008-09-02 18:43:29 UTC (rev 4294)
+++ trunk/data/qcsrc/server/w_laser.qc 2008-09-02 18:46:28 UTC (rev 4295)
@@ -128,7 +128,7 @@
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)
Modified: trunk/data/qcsrc/server/w_nex.qc
===================================================================
--- trunk/data/qcsrc/server/w_nex.qc 2008-09-02 18:43:29 UTC (rev 4294)
+++ trunk/data/qcsrc/server/w_nex.qc 2008-09-02 18:46:28 UTC (rev 4295)
@@ -170,7 +170,7 @@
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)
Modified: trunk/data/qcsrc/server/w_rocketlauncher.qc
===================================================================
--- trunk/data/qcsrc/server/w_rocketlauncher.qc 2008-09-02 18:43:29 UTC (rev 4294)
+++ trunk/data/qcsrc/server/w_rocketlauncher.qc 2008-09-02 18:46:28 UTC (rev 4295)
@@ -420,7 +420,7 @@
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
Modified: trunk/data/qcsrc/server/w_shotgun.qc
===================================================================
--- trunk/data/qcsrc/server/w_shotgun.qc 2008-09-02 18:43:29 UTC (rev 4294)
+++ trunk/data/qcsrc/server/w_shotgun.qc 2008-09-02 18:46:28 UTC (rev 4295)
@@ -136,7 +136,7 @@
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)
Modified: trunk/data/qcsrc/server/w_uzi.qc
===================================================================
--- trunk/data/qcsrc/server/w_uzi.qc 2008-09-02 18:43:29 UTC (rev 4294)
+++ trunk/data/qcsrc/server/w_uzi.qc 2008-09-02 18:46:28 UTC (rev 4295)
@@ -144,7 +144,7 @@
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)
More information about the nexuiz-commits
mailing list