r4140 - in trunk/data/qcsrc: client server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-08-21 12:28:44 -0400 (Thu, 21 Aug 2008)
New Revision: 4140

Modified:
   trunk/data/qcsrc/client/Main.qc
   trunk/data/qcsrc/client/sbar.qc
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/race.qc
Log:
and actually fixed it now


Modified: trunk/data/qcsrc/client/Main.qc
===================================================================
--- trunk/data/qcsrc/client/Main.qc	2008-08-21 16:20:23 UTC (rev 4139)
+++ trunk/data/qcsrc/client/Main.qc	2008-08-21 16:28:44 UTC (rev 4140)
@@ -611,6 +611,7 @@
 
 		case RACE_NET_CHECKPOINT_NEXT_SPEC_QUALIFYING:
 			race_laptime = ReadCoord();
+			race_checkpointtime = -99999;
 			// fall through
 		case RACE_NET_CHECKPOINT_NEXT_QUALIFYING:
 			race_nextcheckpoint = ReadByte();

Modified: trunk/data/qcsrc/client/sbar.qc
===================================================================
--- trunk/data/qcsrc/client/sbar.qc	2008-08-21 16:20:23 UTC (rev 4139)
+++ trunk/data/qcsrc/client/sbar.qc	2008-08-21 16:28:44 UTC (rev 4140)
@@ -1354,7 +1354,7 @@
 		);
 		o += sbar_fontsize_y * '0 1 0';
 
-		if(spectatee_status != -1)
+		if(spectatee_status == -1)
 			s = "^1Use ^3weapon switching^1 to change the speed";
 		else
 			s = "^1Press ^3secondary fire^1 to observe";

Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2008-08-21 16:20:23 UTC (rev 4139)
+++ trunk/data/qcsrc/server/cl_client.qc	2008-08-21 16:28:44 UTC (rev 4140)
@@ -2199,6 +2199,7 @@
 		self.spectatee_status = 0;
 	if(self.spectatee_status != oldspectatee_status)
 	{
+		msg_entity = self;
 		WriteByte(MSG_ONE, SVC_TEMPENTITY);
 		WriteByte(MSG_ONE, TE_CSQC_SPECTATING);
 		WriteByte(MSG_ONE, self.spectatee_status);

Modified: trunk/data/qcsrc/server/race.qc
===================================================================
--- trunk/data/qcsrc/server/race.qc	2008-08-21 16:20:23 UTC (rev 4139)
+++ trunk/data/qcsrc/server/race.qc	2008-08-21 16:28:44 UTC (rev 4140)
@@ -71,8 +71,9 @@
 
 void race_InitSpectator()
 {
-	if(self.enemy.race_laptime)
-		race_SendNextCheckpoint(self.enemy, 1);
+	if(g_race_qualifying)
+		if(msg_entity.enemy.race_laptime)
+			race_SendNextCheckpoint(msg_entity.enemy, 1);
 }
 
 void race_SendTime(entity e, float cp, float t, float tvalid)