r4127 - in branches/nexuiz-2.0: . data/qcsrc/client data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-08-12 16:17:25 -0400 (Tue, 12 Aug 2008)
New Revision: 4127

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
   branches/nexuiz-2.0/data/qcsrc/server/clientcommands.qc
   branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
   branches/nexuiz-2.0/data/qcsrc/server/race.qc
   branches/nexuiz-2.0/data/qcsrc/server/scores.qc
Log:
r4123 | div0 | 2008-08-12 19:36:11 +0200 (Tue, 12 Aug 2008) | 2 lines
fix spuriously appearing ready-nagger
r4124 | div0 | 2008-08-12 20:33:49 +0200 (Tue, 12 Aug 2008) | 2 lines
oops... hide crosshair when scoreboard is forced too
r4125 | div0 | 2008-08-12 20:58:49 +0200 (Tue, 12 Aug 2008) | 2 lines
fix player skipping
r4126 | div0 | 2008-08-12 21:04:49 +0200 (Tue, 12 Aug 2008) | 2 lines
work around current csqc networking bugs crashing clients

Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2008-08-12 19:04:49 UTC (rev 4126)
+++ branches/nexuiz-2.0/.patchsets	2008-08-12 20:17:25 UTC (rev 4127)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-4121
+revisions_applied = 1-4126

Modified: branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/sbar.qc	2008-08-12 19:04:49 UTC (rev 4126)
+++ branches/nexuiz-2.0/data/qcsrc/client/sbar.qc	2008-08-12 20:17:25 UTC (rev 4127)
@@ -1301,6 +1301,8 @@
 		return 1;
 	else if (getstati(STAT_HEALTH) <= 0 && cvar("cl_deathscoreboard"))
 		return 1;
+	else if(sb_showscores_force)
+		return 1;
 	return 0;
 }
 

Modified: branches/nexuiz-2.0/data/qcsrc/server/clientcommands.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/clientcommands.qc	2008-08-12 19:04:49 UTC (rev 4126)
+++ branches/nexuiz-2.0/data/qcsrc/server/clientcommands.qc	2008-08-12 20:17:25 UTC (rev 4127)
@@ -474,6 +474,9 @@
 			r += 1;
 	}
 
+	if(!r)
+		return; // NOTE: this also excludes !p, as r <= p
+
 	if(cvar("sv_ready_restart_nag")) {
 		if(!readyNagActive) {
 			readyNagger = spawn();
@@ -484,7 +487,7 @@
 		}
 	}
 
-	if(!p || r < p)
+	if(r < p)
 		return;
 	
 	ReadyRestart();

Modified: branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_world.qc	2008-08-12 19:04:49 UTC (rev 4126)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_world.qc	2008-08-12 20:17:25 UTC (rev 4127)
@@ -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: branches/nexuiz-2.0/data/qcsrc/server/race.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/race.qc	2008-08-12 19:04:49 UTC (rev 4126)
+++ branches/nexuiz-2.0/data/qcsrc/server/race.qc	2008-08-12 20:17:25 UTC (rev 4127)
@@ -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);

Modified: branches/nexuiz-2.0/data/qcsrc/server/scores.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/scores.qc	2008-08-12 19:04:49 UTC (rev 4126)
+++ branches/nexuiz-2.0/data/qcsrc/server/scores.qc	2008-08-12 20:17:25 UTC (rev 4127)
@@ -594,14 +594,13 @@
 	{
 		pprev = pbestprev = world;
 		pbest = plist;
-		for(p = plist; (p = p.chain); )
+		for(p = plist; (pprev = p), (p = p.chain); )
 		{
 			if(PlayerTeamScore_Compare(p, pbest) > 0)
 			{
 				pbest = p;
 				pbestprev = pprev;
 			}
-			pprev = p;
 		}
 
 		// remove pbest out of the chain