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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-01-14 15:43:03 -0500 (Sun, 14 Jan 2007)
New Revision: 2118

Modified:
   branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
   branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
Log:
only respawn using attack, jump, attack2, hook, use


Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2007-01-14 20:42:46 UTC (rev 2117)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2007-01-14 20:43:03 UTC (rev 2118)
@@ -1360,7 +1360,7 @@
 		{
 			float button_pressed, force_respawn;
 			player_anim();
-			button_pressed = (self.button0 || self.button2 || self.button3 || self.button4 || self.button5 || self.button6 || self.button7 || self.button8 || self.buttonuse);
+			button_pressed = (self.button0 || self.button2 || self.button3 || self.button6 || self.buttonuse);
 			force_respawn = (cvar("g_lms") || cvar("g_forced_respawn"));
 			if (self.deadflag == DEAD_DYING)
 			{

Modified: branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_world.qc	2007-01-14 20:42:46 UTC (rev 2117)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_world.qc	2007-01-14 20:43:03 UTC (rev 2118)
@@ -749,7 +749,7 @@
 	if (time < intermission_exittime)
 		return;
 
-	if (time < intermission_exittime + 10 && !self.button0 && !self.button1 && !self.button2 && !self.button3)
+	if (time < intermission_exittime + 10 && !self.button0 && !self.button2 && !self.button3 && !self.button6 && !self.buttonuse)
 		return;
 
 	GotoNextMap ();