r2103 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-01-13 16:30:58 -0500 (Sat, 13 Jan 2007)
New Revision: 2103

Modified:
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/cl_player.qc
Log:
damn fteqcc


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2007-01-13 21:21:45 UTC (rev 2102)
+++ trunk/data/qcsrc/server/cl_client.qc	2007-01-13 21:30:58 UTC (rev 2103)
@@ -1376,7 +1376,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.button4 || self.button5 || self.button6 || self.button7 || self.button8 || self.buttonuse);
 			force_respawn = cvar("g_lms") || cvar("g_forced_respawn");
 			if (self.deadflag == DEAD_DYING)
 			{

Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc	2007-01-13 21:21:45 UTC (rev 2102)
+++ trunk/data/qcsrc/server/cl_player.qc	2007-01-13 21:30:58 UTC (rev 2103)
@@ -322,7 +322,7 @@
 			self.death_time = ceil((time + sdelay) / waves) * waves;
 		else
 			self.death_time = time + sdelay;
-		if((sdelay + waves > 5.0) && (self.death_time - time > 1.75))
+		if((sdelay + waves >= 5.0) && (self.death_time - time > 1.75))
 			self.respawn_countdown = 10; // first number to count down from is 10
 		else
 			self.respawn_countdown = -1; // do not count down