From 858f345802f1d19a18d2a24ab25a18ccadd0ea1f Mon Sep 17 00:00:00 2001 From: Steel Titanium Date: Mon, 24 Aug 2020 00:56:53 -0400 Subject: [PATCH] Haha NONET... --- src/d_clisrv.c | 7 ++++++- src/d_netfil.c | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index c847f0a65..21b8e86c9 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -2038,6 +2038,7 @@ void CL_UpdateServerList(boolean internetsearch, INT32 room) #endif // ifndef NONET +#ifndef NONET static void M_ConfirmConnect(event_t *ev) { if (ev->type == ev_keydown) @@ -2072,6 +2073,7 @@ static void M_ConfirmConnect(event_t *ev) } } } +#endif static boolean CL_FinishedFileList(void) { @@ -2157,10 +2159,12 @@ static boolean CL_FinishedFileList(void) if (!curl_failedwebdownload) #endif { +#ifndef NONET downloadcompletednum = 0; downloadcompletedsize = 0; totalfilesrequestednum = 0; totalfilesrequestedsize = 0; +#endif for (i = 0; i < fileneedednum; i++) if (fileneeded[i].status == FS_NOTFOUND || fileneeded[i].status == FS_MD5SUMBAD) @@ -2276,7 +2280,6 @@ static boolean CL_ServerConnectionSearchTicker(tic_t *asksent) *asksent = I_GetTime(); } #else - (void)viams; (void)asksent; // No netgames, so we skip this state. cl_mode = CL_ASKJOIN; @@ -2993,8 +2996,10 @@ void CL_Reset(void) fileneedednum = 0; memset(fileneeded, 0, sizeof(fileneeded)); +#ifndef NONET totalfilesrequestednum = 0; totalfilesrequestedsize = 0; +#endif firstconnectattempttime = 0; serverisfull = false; connectiontimeout = (tic_t)cv_nettimeout.value; //reset this temporary hack diff --git a/src/d_netfil.c b/src/d_netfil.c index 621ce2953..c9bfb4ea7 100644 --- a/src/d_netfil.c +++ b/src/d_netfil.c @@ -874,8 +874,10 @@ void Got_Filetxpak(void) file->status = FS_FOUND; CONS_Printf(M_GetText("Downloading %s...(done)\n"), filename); +#ifndef NONET downloadcompletednum++; downloadcompletedsize += file->totalsize; +#endif } } else