Fix entity baseline overflow

src/engine/client/cl_parse.cpp

@@ -403,11 +403,13 @@ void CL_ParseGamestate( msg_t *msg )
 
 	clc.connectPacketCount = 0;
 
-	// wipe local client state
-	CL_ClearState();
+	if ( !cl.reading ) {
+		// wipe local client state
+		CL_ClearState();
 
-	// a gamestate always marks a server command sequence
-	clc.serverCommandSequence = MSG_ReadLong( msg );
+		// a gamestate always marks a server command sequence
+		clc.serverCommandSequence = MSG_ReadLong( msg );
+	}
 
 	// parse all the configstrings and baselines
 	while (true)
@@ -443,21 +445,30 @@ void CL_ParseGamestate( msg_t *msg )
 			entityState_t nullstate{};
 			es = &cl.entityBaselines[ newnum ];
 			MSG_ReadDeltaEntity( msg, &nullstate, es, newnum );
+
+			cl.reading = false;
+		}
+		else if ( cmd == svc_gamestatePartial )
+		{
+			cl.reading = true;
+			break;
 		}
 		else
 		{
 			Sys::Drop( "CL_ParseGamestate: bad command byte" );
 		}
 	}
 
-	clc.clientNum = MSG_ReadLong( msg );
+	if ( !cl.reading ) {
+		clc.clientNum = MSG_ReadLong( msg );
 
-	// parse serverId and other cvars
-	CL_SystemInfoChanged();
+		// parse serverId and other cvars
+		CL_SystemInfoChanged();
 
-	// This used to call CL_StartHunkUsers, but now we enter the download state before loading the
-	// cgame
-	CL_InitDownloads();
+		// This used to call CL_StartHunkUsers, but now we enter the download state before loading the
+		// cgame
+		CL_InitDownloads();
+	}
 }
 
 //=====================================================================

src/engine/client/client.h

@@ -153,6 +153,8 @@ struct clientActive_t
 	clSnapshot_t  snapshots[ PACKET_BACKUP ];
 
 	entityState_t entityBaselines[ MAX_GENTITIES ]; // for delta compression when not in previous frame
+
+	bool reading; // For gamestate that is split between different msg_t
 };
 
 extern clientActive_t cl;

src/engine/qcommon/qcommon.h

@@ -248,12 +248,13 @@ enum svc_ops_e
   svc_bad,
   svc_nop,
   svc_gamestate,
+  svc_gamestatePartial,
   svc_configstring, // [short] [string] only in gamestate messages
   svc_baseline, // only in gamestate messages
   svc_serverCommand, // [string] to be executed by client game module
   svc_download, // [short] size [size bytes]
   svc_snapshot,
-  svc_EOF,
+  svc_EOF
 };
 
 //

src/engine/server/sv_client.cpp

@@ -385,6 +385,16 @@ void SV_SendClientGameState( client_t *client )
 
 		MSG_WriteByte( &msg, svc_baseline );
 		MSG_WriteDeltaEntity( &msg, &nullstate, base, true );
+
+		if ( MAX_MSGLEN - msg.cursize < 128 ) {
+			// We have too many entities to put them all into one msg_t, so split it here
+			MSG_WriteByte( &msg, svc_gamestatePartial );
+			SV_SendMessageToClient( &msg, client );
+
+			MSG_Init( &msg, msgBuffer, sizeof( msgBuffer ) );
+			MSG_WriteLong( &msg, client->lastClientCommand );
+			MSG_WriteByte( &msg, svc_gamestate );
+		}
 	}
 
 	MSG_WriteByte( &msg, svc_EOF );