r5686 - in trunk/data/qcsrc: client common server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-01-28 12:44:32 -0500 (Wed, 28 Jan 2009)
New Revision: 5686

Modified:
   trunk/data/qcsrc/client/Main.qc
   trunk/data/qcsrc/common/constants.qh
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/clientcommands.qc
Log:
get rid of TE_CSQC_WARMUP


Modified: trunk/data/qcsrc/client/Main.qc
===================================================================
--- trunk/data/qcsrc/client/Main.qc	2009-01-28 17:31:40 UTC (rev 5685)
+++ trunk/data/qcsrc/client/Main.qc	2009-01-28 17:44:32 UTC (rev 5686)
@@ -495,6 +495,7 @@
 	ready_waiting_for_me = (nags & 2);
 	vote_waiting = (nags & 4);
 	vote_waiting_for_me = (nags & 8);
+	warmup_stage = (nags & 16);
 }
 
 // CSQC_Ent_Update : Called every frame that the server has indicated an update to the SSQC / CSQC entity has occured.
@@ -827,11 +828,6 @@
 	current_viewzoom = 0.6;
 }
 
-void Net_ReadWarmupStage()
-{
-	warmup_stage = ReadByte();
-}
-
 // CSQC_Parse_TempEntity : Handles all temporary entity network data in the CSQC layer.
 // You must ALWAYS first acquire the temporary ID, which is sent as a byte.
 // Return value should be 1 if CSQC handled the temporary entity, otherwise return 0 to have the engine process the event.
@@ -883,10 +879,6 @@
 			Net_ReadHoldAngles();
 			bHandled = true;
 			break;
-		case TE_CSQC_WARMUP:
-			Net_ReadWarmupStage();
-			bHandled = true;
-			break;
 		case TE_CSQC_FOG:
 			Net_ReadFog();
 			bHandled = true;

Modified: trunk/data/qcsrc/common/constants.qh
===================================================================
--- trunk/data/qcsrc/common/constants.qh	2009-01-28 17:31:40 UTC (rev 5685)
+++ trunk/data/qcsrc/common/constants.qh	2009-01-28 17:44:32 UTC (rev 5686)
@@ -223,7 +223,6 @@
 const float TE_CSQC_SPAWN = 112;
 const float TE_CSQC_ZOOMNOTIFY = 113; // TODO turn into shared ent
 const float TE_CSQC_HOLDANGLES = 114; // TODO turn into shared ent
-const float TE_CSQC_WARMUP = 115; // TODO turn into shared ent
 const float TE_CSQC_FOG = 116; // TODO turn into shared ent
 
 // ideas: turn TE_CSQC_FORCESCOREBOARD, TE_CSQC_SPECTATING, TE_CSQC_ZOOMNOTIFY, TE_CSQC_HOLDANGLES into a single shared ent, the other two in ones for their own

Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2009-01-28 17:31:40 UTC (rev 5685)
+++ trunk/data/qcsrc/server/cl_client.qc	2009-01-28 17:44:32 UTC (rev 5686)
@@ -1268,16 +1268,6 @@
 	{
 		sprint(self, strcat("nexuiz-csqc protocol ", ftos(CSQC_REVISION), "\n"));
 
-		msg_entity = self;
-
-		if(inWarmupStage)
-		{
-			msg_entity = self;
-			WriteByte(MSG_ONE, SVC_TEMPENTITY);
-			WriteByte(MSG_ONE, TE_CSQC_WARMUP);
-			WriteByte(MSG_ONE, 1);
-		}
-
 		if(cvar("g_bugrigs"))
 			stuffcmd(self, "cl_cmd settemp chase_active 1\n");
 	}

Modified: trunk/data/qcsrc/server/clientcommands.qc
===================================================================
--- trunk/data/qcsrc/server/clientcommands.qc	2009-01-28 17:31:40 UTC (rev 5685)
+++ trunk/data/qcsrc/server/clientcommands.qc	2009-01-28 17:44:32 UTC (rev 5686)
@@ -18,6 +18,8 @@
 		if(to.vote_vote == 0)
 			nags |= 8;
 	}
+	if(inWarmupStage)
+		nags |= 16;
 
 	if(sendflags & 128)
 	{
@@ -361,14 +363,7 @@
 	FOR_EACH_CLIENTSLOT(e)
 		e.ready = 0;
 	readycount = 0;
-	Nagger_ReadyCounted();
-	FOR_EACH_REALCLIENT(e)
-	{
-		msg_entity = e;
-		WriteByte(MSG_ONE, SVC_TEMPENTITY);
-		WriteByte(MSG_ONE, TE_CSQC_WARMUP);
-		WriteByte(MSG_ONE, 0);
-	}
+	Nagger_ReadyCounted(); // NOTE: this causes a resend of that entity, and will also turn off warmup state on the client
 
 	if(cvar("teamplay_lockonrestart") && teams_matter) {
 		lockteams = 1;