r1794 - branches/nexuiz-2.0/data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Tue Aug 1 07:16:16 EDT 2006


Author: div0
Date: 2006-08-01 07:16:15 -0400 (Tue, 01 Aug 2006)
New Revision: 1794

Modified:
   branches/nexuiz-2.0/data/qcsrc/server/cl_weapons.qc
Log:
damn "self" global


Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_weapons.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_weapons.qc	2006-07-30 22:34:14 UTC (rev 1793)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_weapons.qc	2006-08-01 11:16:15 UTC (rev 1794)
@@ -61,11 +61,15 @@
 		if(!(e.items & w))
 		{
 			remove(wep);
+			self = e;
 			return;
 		}
 		weapon_shotgun();
 		if(startitem_failed)
+		{
+			self = e;
 			return;
+		}
 		if(doreduce)
 		{
 			ammo = min(e.ammo_shells, wep.ammo_shells);
@@ -79,11 +83,15 @@
 		if(!(e.items & w))
 		{
 			remove(wep);
+			self = e;
 			return;
 		}
 		weapon_uzi();
 		if(startitem_failed)
+		{
+			self = e;
 			return;
+		}
 		if(doreduce)
 		{
 			ammo = min(e.ammo_nails, wep.ammo_nails);
@@ -96,12 +104,16 @@
 		w = IT_GRENADE_LAUNCHER;
 		if(!(e.items & w))
 		{
+			self = e;
 			remove(wep);
 			return;
 		}
 		weapon_grenadelauncher();
 		if(startitem_failed)
+		{
+			self = e;
 			return;
+		}
 		if(doreduce)
 		{
 			ammo = min(e.ammo_rockets, wep.ammo_rockets);
@@ -114,12 +126,16 @@
 		w = IT_ELECTRO;
 		if(!(e.items & w))
 		{
+			self = e;
 			remove(wep);
 			return;
 		}
 		weapon_electro();
 		if(startitem_failed)
+		{
+			self = e;
 			return;
+		}
 		if(doreduce)
 		{
 			ammo = min(e.ammo_cells, wep.ammo_cells);
@@ -132,12 +148,16 @@
 		w = IT_CRYLINK;
 		if(!(e.items & w))
 		{
+			self = e;
 			remove(wep);
 			return;
 		}
 		weapon_crylink();
 		if(startitem_failed)
+		{
+			self = e;
 			return;
+		}
 		if(doreduce)
 		{
 			ammo = min(e.ammo_cells, wep.ammo_cells);
@@ -150,12 +170,16 @@
 		w = IT_NEX;
 		if(!(e.items & w))
 		{
+			self = e;
 			remove(wep);
 			return;
 		}
 		weapon_nex();
 		if(startitem_failed)
+		{
+			self = e;
 			return;
+		}
 		if(doreduce)
 		{
 			ammo = min(e.ammo_cells, wep.ammo_cells);
@@ -168,12 +192,16 @@
 		w = IT_HAGAR;
 		if(!(e.items & w))
 		{
+			self = e;
 			remove(wep);
 			return;
 		}
 		weapon_hagar();
 		if(startitem_failed)
+		{
+			self = e;
 			return;
+		}
 		if(doreduce)
 		{
 			ammo = min(e.ammo_rockets, wep.ammo_rockets);
@@ -186,12 +214,16 @@
 		w = IT_ROCKET_LAUNCHER;
 		if(!(e.items & w))
 		{
+			self = e;
 			remove(wep);
 			return;
 		}
 		weapon_rocketlauncher();
 		if(startitem_failed)
+		{
+			self = e;
 			return;
+		}
 		if(doreduce)
 		{
 			ammo = min(e.ammo_rockets, wep.ammo_rockets);




More information about the nexuiz-commits mailing list