[quake3-commits] r1670 - trunk/code/server

[DONOTREPLY at icculus.org]

Author: tma
Date: 2009-10-15 19:39:19 -0400 (Thu, 15 Oct 2009)
New Revision: 1670

Modified:
   trunk/code/server/sv_ccmds.c
Log:
* (bug #4232) Avoid "cl.snap.serverTime < cl.oldFrameServerTime" for slow
  loading clients combined with short g_warmups


Modified: trunk/code/server/sv_ccmds.c
===================================================================
--- trunk/code/server/sv_ccmds.c	2009-10-15 13:11:49 UTC (rev 1669)
+++ trunk/code/server/sv_ccmds.c	2009-10-15 23:39:19 UTC (rev 1670)
@@ -278,6 +278,15 @@
 	sv.serverId = com_frameTime;
 	Cvar_Set( "sv_serverid", va("%i", sv.serverId ) );
 
+	// if a map_restart occurs while a client is changing maps, we need
+	// to give them the correct time so that when they finish loading
+	// they don't violate the backwards time check in cl_cgame.c
+	for (i=0 ; i<sv_maxclients->integer ; i++) {
+		if (svs.clients[i].state >= CS_CONNECTED) {
+			svs.clients[i].oldServerTime = sv.restartTime;
+		}
+	}
+
 	// reset all the vm data in place without changing memory allocation
 	// note that we do NOT set sv.state = SS_LOADING, so configstrings that
 	// had been changed from their default values will generate broadcast updates