r4128 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-08-13 04:31:03 -0400 (Wed, 13 Aug 2008)
New Revision: 4128

Modified:
   trunk/data/qcsrc/server/g_world.qc
   trunk/data/qcsrc/server/scores.qc
Log:
remove workarounds for broken MSG_ALL - let's see what breaks!


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

Modified: trunk/data/qcsrc/server/scores.qc
===================================================================
--- trunk/data/qcsrc/server/scores.qc	2008-08-12 20:17:25 UTC (rev 4127)
+++ trunk/data/qcsrc/server/scores.qc	2008-08-13 08:31:03 UTC (rev 4128)
@@ -174,8 +174,7 @@
 		TeamScore_Spawn(COLOR_TEAM3, "Yellow");
 	if(teams >= 4)
 		TeamScore_Spawn(COLOR_TEAM4, "Pink");
-	FOR_EACH_REALCLIENT(msg_entity) // cannot use MSG_ALL here, as that may come too early on level changes (that SUCKS)
-		ScoreInfo_Write(MSG_ONE);
+	ScoreInfo_Write(MSG_ALL);
 }
 
 /*