r1786 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri Jul 28 09:41:24 EDT 2006
Author: div0
Date: 2006-07-28 09:41:24 -0400 (Fri, 28 Jul 2006)
New Revision: 1786
Modified:
trunk/data/qcsrc/server/cl_weapons.qc
Log:
removed drop message for on-die drops
Modified: trunk/data/qcsrc/server/cl_weapons.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weapons.qc 2006-07-28 13:19:21 UTC (rev 1785)
+++ trunk/data/qcsrc/server/cl_weapons.qc 2006-07-28 13:41:24 UTC (rev 1786)
@@ -39,10 +39,14 @@
local float w, ammo;
local entity wep, e;
+ w = self.weapon;
+ if(w == WEP_LASER)
+ return;
+
e = self;
wep = spawn();
self = wep;
- w = e.weapon;
+
setorigin(wep, e.origin + delta);
makevectors(e.angles);
wep.classname = "droppedweapon";
@@ -58,6 +62,8 @@
return;
}
weapon_shotgun();
+ if(startitem_failed)
+ return;
if(doreduce)
{
ammo = min(e.ammo_shells, wep.ammo_shells);
@@ -74,6 +80,8 @@
return;
}
weapon_uzi();
+ if(startitem_failed)
+ return;
if(doreduce)
{
ammo = min(e.ammo_nails, wep.ammo_nails);
@@ -90,6 +98,8 @@
return;
}
weapon_grenadelauncher();
+ if(startitem_failed)
+ return;
if(doreduce)
{
ammo = min(e.ammo_rockets, wep.ammo_rockets);
@@ -106,6 +116,8 @@
return;
}
weapon_electro();
+ if(startitem_failed)
+ return;
if(doreduce)
{
ammo = min(e.ammo_cells, wep.ammo_cells);
@@ -122,6 +134,8 @@
return;
}
weapon_crylink();
+ if(startitem_failed)
+ return;
if(doreduce)
{
ammo = min(e.ammo_cells, wep.ammo_cells);
@@ -138,6 +152,8 @@
return;
}
weapon_nex();
+ if(startitem_failed)
+ return;
if(doreduce)
{
ammo = min(e.ammo_cells, wep.ammo_cells);
@@ -154,6 +170,8 @@
return;
}
weapon_hagar();
+ if(startitem_failed)
+ return;
if(doreduce)
{
ammo = min(e.ammo_rockets, wep.ammo_rockets);
@@ -170,6 +188,8 @@
return;
}
weapon_rocketlauncher();
+ if(startitem_failed)
+ return;
if(doreduce)
{
ammo = min(e.ammo_rockets, wep.ammo_rockets);
@@ -179,7 +199,8 @@
}
if(e.items & w)
- sprint(e, strcat("You dropped the ^2", wep.netname, "\n"));
+ if(e.health >= 1)
+ sprint(e, strcat("You dropped the ^2", wep.netname, "\n"));
wep.owner = e;
setorigin(wep, wep.origin);
wep.nextthink = time + 0.5;
More information about the nexuiz-commits
mailing list