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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2006-07-07 02:59:07 -0400 (Fri, 07 Jul 2006)
New Revision: 1729

Modified:
   branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
   branches/nexuiz-2.0/data/qcsrc/server/cl_player.qc
   branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc
   branches/nexuiz-2.0/data/qcsrc/server/w_uzi.qc
Log:
merging fixes committed to trunk before and running on my server for some time now (laser target removal, error message on suspected bug, Uzi weapon switch)


Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2006-07-06 22:02:04 UTC (rev 1728)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2006-07-07 06:59:07 UTC (rev 1729)
@@ -817,7 +817,9 @@
 	self.flags = save;
 
 	// remove laserdot
-	remove(self.weaponentity.lasertarget);
+	if(self.weaponentity)
+		if(self.weaponentity.lasertarget)
+			remove(self.weaponentity.lasertarget);
 
 	// player was dead, decrease dead count
 	if(cvar("g_lms") && self.frags < 1)

Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_player.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_player.qc	2006-07-06 22:02:04 UTC (rev 1728)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_player.qc	2006-07-07 06:59:07 UTC (rev 1729)
@@ -364,7 +364,9 @@
 		SUB_SetFade (self, time + 12 + random () * 4, 1);
 
 		// remove laserdot
-		remove(self.weaponentity.lasertarget);
+		if(self.weaponentity)
+			if(self.weaponentity.lasertarget)
+				remove(self.weaponentity.lasertarget);
 
 		if(clienttype(self) == CLIENTTYPE_REAL)
 		{

Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc	2006-07-06 22:02:04 UTC (rev 1728)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc	2006-07-07 06:59:07 UTC (rev 1729)
@@ -378,6 +378,11 @@
 			self.weaponentity.frame = fr;
 	}
 
+	if(self.weapon_think == w_ready && func != w_ready && self.weaponentity.state == WS_RAISE)
+	{
+		error("Tried to override initial weapon think function - should this really happen?\n");
+	}
+
 	if(cvar("g_runematch"))
 	{
 		if(self.runes & RUNE_SPEED)

Modified: branches/nexuiz-2.0/data/qcsrc/server/w_uzi.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_uzi.qc	2006-07-06 22:02:04 UTC (rev 1728)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_uzi.qc	2006-07-07 06:59:07 UTC (rev 1729)
@@ -44,8 +44,13 @@
 // weapon frames
 void()	uzi_fire1_02 =
 {
-	if (self.button0 && self.weapon == self.switchweapon)
+	if(self.weapon != self.switchweapon) // abort immediately if switching
 	{
+		w_ready();
+		return;
+	}
+	if (self.button0)
+	{
 		if (!weapon_action(self.weapon, WR_CHECKAMMO2))
 		{
 			self.switchweapon = w_getbestweapon(self);