Haha NONET...

This commit is contained in:
Steel Titanium 2020-08-24 00:56:53 -04:00
parent 88e7b6198d
commit 509c57a8d6
2 changed files with 8 additions and 1 deletions

View file

@ -2038,6 +2038,7 @@ void CL_UpdateServerList(boolean internetsearch, INT32 room)
#endif // ifndef NONET #endif // ifndef NONET
#ifndef NONET
static void M_ConfirmConnect(event_t *ev) static void M_ConfirmConnect(event_t *ev)
{ {
if (ev->type == ev_keydown) if (ev->type == ev_keydown)
@ -2072,6 +2073,7 @@ static void M_ConfirmConnect(event_t *ev)
} }
} }
} }
#endif
static boolean CL_FinishedFileList(void) static boolean CL_FinishedFileList(void)
{ {
@ -2157,10 +2159,12 @@ static boolean CL_FinishedFileList(void)
if (!curl_failedwebdownload) if (!curl_failedwebdownload)
#endif #endif
{ {
#ifndef NONET
downloadcompletednum = 0; downloadcompletednum = 0;
downloadcompletedsize = 0; downloadcompletedsize = 0;
totalfilesrequestednum = 0; totalfilesrequestednum = 0;
totalfilesrequestedsize = 0; totalfilesrequestedsize = 0;
#endif
for (i = 0; i < fileneedednum; i++) for (i = 0; i < fileneedednum; i++)
if (fileneeded[i].status == FS_NOTFOUND || fileneeded[i].status == FS_MD5SUMBAD) 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(); *asksent = I_GetTime();
} }
#else #else
(void)viams;
(void)asksent; (void)asksent;
// No netgames, so we skip this state. // No netgames, so we skip this state.
cl_mode = CL_ASKJOIN; cl_mode = CL_ASKJOIN;
@ -2993,8 +2996,10 @@ void CL_Reset(void)
fileneedednum = 0; fileneedednum = 0;
memset(fileneeded, 0, sizeof(fileneeded)); memset(fileneeded, 0, sizeof(fileneeded));
#ifndef NONET
totalfilesrequestednum = 0; totalfilesrequestednum = 0;
totalfilesrequestedsize = 0; totalfilesrequestedsize = 0;
#endif
firstconnectattempttime = 0; firstconnectattempttime = 0;
serverisfull = false; serverisfull = false;
connectiontimeout = (tic_t)cv_nettimeout.value; //reset this temporary hack connectiontimeout = (tic_t)cv_nettimeout.value; //reset this temporary hack

View file

@ -874,8 +874,10 @@ void Got_Filetxpak(void)
file->status = FS_FOUND; file->status = FS_FOUND;
CONS_Printf(M_GetText("Downloading %s...(done)\n"), CONS_Printf(M_GetText("Downloading %s...(done)\n"),
filename); filename);
#ifndef NONET
downloadcompletednum++; downloadcompletednum++;
downloadcompletedsize += file->totalsize; downloadcompletedsize += file->totalsize;
#endif
} }
} }
else else