[nexuiz-commits] r6232 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-03-20 09:15:51 -0400 (Fri, 20 Mar 2009)
New Revision: 6232

Modified:
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/constants.qh
Log:
fix spawning from spectator mode (no longer cause a jump there)


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2009-03-20 12:52:41 UTC (rev 6231)
+++ trunk/data/qcsrc/server/cl_client.qc	2009-03-20 13:15:51 UTC (rev 6232)
@@ -2026,8 +2026,7 @@
 		if (self.BUTTON_JUMP && !self.version_mismatch) {
 			self.welcomemessage_time = 0;
 			self.flags &~= FL_JUMPRELEASED;
-			LeaveSpectatorMode();
-			return;
+			self.flags |= FL_SPAWNING;
 		} else if(self.BUTTON_ATCK && !self.version_mismatch) {
 			self.welcomemessage_time = 0;
 			self.flags &~= FL_JUMPRELEASED;
@@ -2038,6 +2037,12 @@
 	} else {
 		if (!(self.BUTTON_ATCK || self.BUTTON_JUMP)) {
 			self.flags |= FL_JUMPRELEASED;
+			if(self.flags & FL_SPAWNING)
+			{
+				self.flags &~= FL_SPAWNING;
+				LeaveSpectatorMode();
+				return;
+			}
 		}
 	}
 	PrintWelcomeMessage(self);
@@ -2049,8 +2054,7 @@
 		if (self.BUTTON_JUMP && !self.version_mismatch) {
 			self.welcomemessage_time = 0;
 			self.flags &~= FL_JUMPRELEASED;
-			LeaveSpectatorMode();
-			return;
+			self.flags |= FL_SPAWNING;
 		} else if(self.BUTTON_ATCK) {
 			self.welcomemessage_time = 0;
 			self.flags &~= FL_JUMPRELEASED;
@@ -2072,6 +2076,12 @@
 	} else {
 		if (!(self.BUTTON_ATCK || self.BUTTON_ATCK2)) {
 			self.flags |= FL_JUMPRELEASED;
+			if(self.flags & FL_SPAWNING)
+			{
+				self.flags &~= FL_SPAWNING;
+				LeaveSpectatorMode();
+				return;
+			}
 		}
 	}
 	PrintWelcomeMessage(self);

Modified: trunk/data/qcsrc/server/constants.qh
===================================================================
--- trunk/data/qcsrc/server/constants.qh	2009-03-20 12:52:41 UTC (rev 6231)
+++ trunk/data/qcsrc/server/constants.qh	2009-03-20 13:15:51 UTC (rev 6232)
@@ -21,6 +21,7 @@
 float	FL_PROJECTILE				= 32768;
 float	FL_TOSSED				= 65536;
 float   FL_NO_WEAPON_STAY       = 131072;
+float   FL_SPAWNING       = 262144;
 
 float	MOVETYPE_NONE				= 0;
 float	MOVETYPE_ANGLENOCLIP			= 1;