From 0e2bef3f1a8843a03e9946059b2e4b8089a4f4ac Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Wed, 17 Apr 2019 23:51:15 -0500
Subject: [PATCH] Wait, we don't need pages, just first file index...

---
 src/d_clisrv.c |  2 +-
 src/d_clisrv.h |  3 +--
 src/d_netfil.c | 35 ++++++++++++++---------------------
 src/d_netfil.h |  3 +--
 4 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 1543bf68..1ce6256b 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2029,7 +2029,7 @@ static boolean CL_ServerConnectionSearchTicker(boolean viams, tic_t *asksent)
 		if (client)
 		{
 			D_ParseFileneeded(serverlist[i].info.fileneedednum, serverlist[i].info.fileneeded, 0);
-			if (serverlist[i].info.fileneedednum & FILENEEDED_MORE)
+			if (serverlist[i].info.kartvars & SV_LOTSOFADDONS)
 			{
 				cl_mode = CL_ASKFULLFILELIST;
 				return true;
diff --git a/src/d_clisrv.h b/src/d_clisrv.h
index a4324d69..dff15f35 100644
--- a/src/d_clisrv.h
+++ b/src/d_clisrv.h
@@ -371,13 +371,12 @@ typedef struct
 } ATTRPACK joinchallenge_pak;
 
 #define SV_SPEEDMASK 0x03
+#define SV_LOTSOFADDONS 0x20
 #define SV_DEDICATED 0x40
 #define SV_PASSWORD 0x80
 
 #define MAXSERVERNAME 32
 #define MAXFILENEEDED 915
-#define MAXFILENEEDEDPAGES MAX_WADFILES
-#define FILENEEDED_MORE 0x80
 // This packet is too large
 typedef struct
 {
diff --git a/src/d_netfil.c b/src/d_netfil.c
index 7e8fe0b8..42f7621c 100644
--- a/src/d_netfil.c
+++ b/src/d_netfil.c
@@ -101,46 +101,39 @@ char downloaddir[512] = "DOWNLOAD";
 INT32 lastfilenum = -1;
 #endif
 
-UINT16 fileneededpages = 0;
-static size_t fileneededpagestart[MAXFILENEEDEDPAGES];
-
 /** Fills a serverinfo packet with information about wad files loaded.
   *
   * \todo Give this function a better name since it is in global scope.
   * Used to have size limiting built in - now handed via W_LoadWadFile in w_wad.c
   *
   */
-UINT8 *PutFileNeeded(UINT16 page)
+UINT8 *PutFileNeeded(UINT16 firstfile)
 {
 	size_t i;
 	UINT8 count = 0;
-	UINT8 *p = netbuffer->u.serverinfo.fileneeded;
+	UINT8 *p_start = netbuffer->u.serverinfo.fileneeded;
+	UINT8 *p = p_start;
 	char wadfilename[MAX_WADPATH] = "";
 	UINT8 filestatus;
 
-	if (page > fileneededpages)
-			I_Error("Fileneeded page %d accessed before a prior page", page);
-	else if (page == 0)
-	{
-		fileneededpages = 0;
-		memset(fileneededpagestart, 0, sizeof(fileneededpagestart)); // ??? I guess.
-		fileneededpagestart[0] = mainwads;
-	}
-
-	for (i = fileneededpagestart[page]; i < (fileneededpagestart[page+1] ?: numwadfiles); i++)
+	for (i = mainwads; i < numwadfiles; i++)
 	{
 		// If it has only music/sound lumps, don't put it in the list
 		if (!wadfiles[i]->important)
 			continue;
 
+		if (firstfile)
+		{ // Skip files until we reach the first file.
+			firstfile--;
+			continue;
+		}
+
 		nameonly(strcpy(wadfilename, wadfiles[i]->filename));
 
-		if (p + 1 + 4 + strlen(wadfilename) + 16 > netbuffer->u.serverinfo.fileneeded + MAXFILENEEDED)
+		if (p + 1 + 4 + strlen(wadfilename) + 16 > p_start + MAXFILENEEDED)
 		{
-			// Too many files for this page, so mark the next page to start here and finish up.
-			fileneededpagestart[page+1] = i;
-			fileneededpages = page+1;
-			count |= FILENEEDED_MORE;
+			// Too many files to send all at once
+			netbuffer->u.serverinfo.kartvars |= SV_LOTSOFADDONS;
 			break;
 		}
 
@@ -178,7 +171,7 @@ void D_ParseFileneeded(INT32 fileneedednum_parm, UINT8 *fileneededstr, UINT16 fi
 	UINT8 *p;
 	UINT8 filestatus;
 
-	fileneedednum = firstfile + (fileneedednum_parm & ~FILENEEDED_MORE);
+	fileneedednum = firstfile + fileneedednum_parm;
 	p = (UINT8 *)fileneededstr;
 	for (i = firstfile; i < fileneedednum; i++)
 	{
diff --git a/src/d_netfil.h b/src/d_netfil.h
index 97a0d0fe..2f033331 100644
--- a/src/d_netfil.h
+++ b/src/d_netfil.h
@@ -53,8 +53,7 @@ extern char downloaddir[512];
 extern INT32 lastfilenum;
 #endif
 
-extern UINT16 fileneededpages;
-UINT8 *PutFileNeeded(UINT16 page);
+UINT8 *PutFileNeeded(UINT16 firstfile);
 void D_ParseFileneeded(INT32 fileneedednum_parm, UINT8 *fileneededstr, UINT16 firstfile);
 void CL_PrepareDownloadSaveGame(const char *tmpsave);