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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2006-07-29 07:16:53 -0400 (Sat, 29 Jul 2006)
New Revision: 1791

Modified:
   branches/nexuiz-2.0/data/qcsrc/server/cl_weapons.qc
   branches/nexuiz-2.0/data/qcsrc/server/clientcommands.qc
   branches/nexuiz-2.0/data/qcsrc/server/defs.qh
   branches/nexuiz-2.0/data/qcsrc/server/t_items.qc
Log:
distribute frags on "spec"; weapon dropping fix


Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_weapons.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_weapons.qc	2006-07-29 11:15:08 UTC (rev 1790)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_weapons.qc	2006-07-29 11:16:53 UTC (rev 1791)
@@ -42,6 +42,8 @@
 	w = self.weapon;
 	if(w == WEP_LASER)
 		return;
+	if(w == 0)
+		return; // just in case
 
 	e = self;
 	wep = spawn();

Modified: branches/nexuiz-2.0/data/qcsrc/server/clientcommands.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/clientcommands.qc	2006-07-29 11:15:08 UTC (rev 1790)
+++ branches/nexuiz-2.0/data/qcsrc/server/clientcommands.qc	2006-07-29 11:16:53 UTC (rev 1791)
@@ -302,6 +302,7 @@
 		if(cvar("g_lms") || cvar("g_arena"))
 			return; // don't allow spectating in lms, unless player runs out of lives
 		if(self.classname == "player" && cvar("sv_spectate") == 1) {
+			DistributeFragsAmongTeam(self, self.team, 1.0);
 			self.classname = "observer";
 			PutClientInServer();
 		}

Modified: branches/nexuiz-2.0/data/qcsrc/server/defs.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/defs.qh	2006-07-29 11:15:08 UTC (rev 1790)
+++ branches/nexuiz-2.0/data/qcsrc/server/defs.qh	2006-07-29 11:16:53 UTC (rev 1791)
@@ -269,3 +269,5 @@
 
 string gamemode_name;
 float teams_matter;
+
+float startitem_failed;

Modified: branches/nexuiz-2.0/data/qcsrc/server/t_items.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/t_items.qc	2006-07-29 11:15:08 UTC (rev 1790)
+++ branches/nexuiz-2.0/data/qcsrc/server/t_items.qc	2006-07-29 11:16:53 UTC (rev 1791)
@@ -230,6 +230,8 @@
 	vector org;
 	org = self.origin;
 
+	startitem_failed = FALSE;
+
 	if (self.classname != "droppedweapon" && !self.noalign)
 	{
 		vector z_offset;
@@ -257,6 +259,7 @@
 	if (!(cvar("g_pickup_items") && !cvar("g_nixnex")) && !cvar("g_minstagib") &&
 			itemid != IT_STRENGTH && itemid != IT_INVINCIBLE && itemid != IT_HEALTH)
 	{
+		startitem_failed = TRUE;
 		remove (self);
 		return;
 	}
@@ -267,6 +270,7 @@
 		if (self.classname != "droppedweapon" &&
 		    self.classname != "minstagib")
 		{
+			startitem_failed = TRUE;
 			remove (self);
 			return;
 		}
@@ -274,12 +278,14 @@
 
 	if(cvar("g_lms") && (self.classname != "droppedweapon"))
 	{
+		startitem_failed = TRUE;
 		remove(self);
 		return;
 	}
 
 	if(cvar("g_instagib") || cvar("g_rocketarena"))
 	{
+		startitem_failed = TRUE;
 		remove(self);
 		return;
 	}
@@ -290,6 +296,7 @@
 		traceline(self.origin, self.origin, MOVE_NORMAL, self);
 		if (trace_dpstartcontents & DPCONTENTS_NODROP)
 		{
+			startitem_failed = TRUE;
 			remove(self);
 			return;
 		}