From 9e1146bc3052a2a766a8ebddb9e00df183700104 Mon Sep 17 00:00:00 2001 From: James R Date: Sun, 12 Dec 2021 02:47:46 -0800 Subject: [PATCH 1/2] Disable downloading for now --- src/d_netfil.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/d_netfil.c b/src/d_netfil.c index 5714c39cd..f8edfbf03 100644 --- a/src/d_netfil.c +++ b/src/d_netfil.c @@ -276,11 +276,16 @@ boolean CL_CheckDownloadable(void) } // Downloading locally disabled +#if 0 if (!dlstatus && M_CheckParm("-nodownload")) dlstatus = 3; if (!dlstatus) return true; +#else + if (!dlstatus) + dlstatus = 3; +#endif // not downloadable, put reason in console CONS_Alert(CONS_NOTICE, M_GetText("You need additional files to connect to this server:\n")); From 32127f37ee5e94844178ab6414ae1ec116306baa Mon Sep 17 00:00:00 2001 From: James R Date: Sun, 12 Dec 2021 02:58:06 -0800 Subject: [PATCH 2/2] Check mainwads netgame md5 in developer build --- src/d_netfil.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/d_netfil.c b/src/d_netfil.c index f8edfbf03..7aec8d13e 100644 --- a/src/d_netfil.c +++ b/src/d_netfil.c @@ -161,10 +161,16 @@ UINT8 *PutFileNeeded(UINT16 firstfile) char wadfilename[MAX_WADPATH] = ""; UINT8 filestatus; - for (i = mainwads+1; i < numwadfiles; i++) //mainwads+1, otherwise we start on the first mainwad +#ifdef DEVELOP + i = 0; +#else + i = mainwads + 1; +#endif + + for (; i < numwadfiles; i++) //mainwads+1, otherwise we start on the first mainwad { // If it has only music/sound lumps, don't put it in the list - if (!wadfiles[i]->important) + if (i > mainwads && !wadfiles[i]->important) continue; if (firstfile) @@ -494,7 +500,12 @@ INT32 CL_CheckFiles(void) CONS_Debug(DBG_NETPLAY, "searching for '%s' ", fileneeded[i].filename); // Check in already loaded files - for (j = mainwads+1; wadfiles[j]; j++) +#ifdef DEVELOP + j = 0; +#else + j = mainwads + 1; +#endif + for (; wadfiles[j]; j++) { nameonly(strcpy(wadfilename, wadfiles[j]->filename)); if (!stricmp(wadfilename, fileneeded[i].filename) &&