r4126 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-08-12 15:04:49 -0400 (Tue, 12 Aug 2008)
New Revision: 4126

Modified:
   trunk/data/qcsrc/server/g_world.qc
   trunk/data/qcsrc/server/race.qc
Log:
work around current csqc networking bugs crashing clients


Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2008-08-12 18:58:49 UTC (rev 4125)
+++ trunk/data/qcsrc/server/g_world.qc	2008-08-12 19:04:49 UTC (rev 4126)
@@ -1882,7 +1882,12 @@
 	mapvote_screenshot_dir = strzone(mapvote_screenshot_dir);
 
 	if(!cvar("g_maplist_textonly"))
-		MapVote_SendData(MSG_ALL);
+	{
+		// FIXME reenable this when it works in the engine
+		// MapVote_SendData(MSG_ALL);
+		FOR_EACH_REALCLIENT(msg_entity)
+			MapVote_SendData(MSG_ONE);
+	}
 }
 
 void MapVote_SendPicture(float id)
@@ -2173,7 +2178,10 @@
 	if(!cvar("g_maplist_textonly"))
 	if(mapvote_dirty) // 1 if "keeptwo" or "impulse" happened before
 	{
-		MapVote_UpdateData(MSG_BROADCAST);
+		// FIXME reenable this when it works in the engine
+		// MapVote_UpdateData(MSG_BROADCAST);
+		FOR_EACH_REALCLIENT(msg_entity)
+			MapVote_UpdateData(MSG_ONE);
 		mapvote_dirty = FALSE;
 	}
 

Modified: trunk/data/qcsrc/server/race.qc
===================================================================
--- trunk/data/qcsrc/server/race.qc	2008-08-12 18:58:49 UTC (rev 4125)
+++ trunk/data/qcsrc/server/race.qc	2008-08-12 19:04:49 UTC (rev 4126)
@@ -228,6 +228,7 @@
 		race_checkpoint_lastlaps[cp] = lself;
 
 		if(clienttype(oth) == CLIENTTYPE_REAL)
+		if(oth.flags & FL_CLIENT)
 		{
 			msg_entity = oth;
 			WriteByte(MSG_ONE, SVC_TEMPENTITY);