From 87d2ad0c236fd0fa4a43e6b2d4ecbdc65eb0701e Mon Sep 17 00:00:00 2001 From: Steel Titanium Date: Mon, 24 Aug 2020 01:13:59 -0400 Subject: [PATCH] Remind me why NONET exists? --- src/d_clisrv.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 581b6d2d..4364051d 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -2038,9 +2038,9 @@ void CL_UpdateServerList(boolean internetsearch, INT32 room) #endif // ifndef NONET -#ifndef NONET static void M_ConfirmConnect(event_t *ev) { +#ifndef NONET if (ev->type == ev_keydown) { if (ev->data1 == ' ' || ev->data1 == 'y' || ev->data1 == KEY_ENTER || ev->data1 == gamecontrol[gc_accelerate][0] || ev->data1 == gamecontrol[gc_accelerate][1]) @@ -2072,8 +2072,8 @@ static void M_ConfirmConnect(event_t *ev) M_ClearMenus(true); } } -} #endif +} static boolean CL_FinishedFileList(void) { @@ -2164,12 +2164,15 @@ static boolean CL_FinishedFileList(void) downloadcompletedsize = 0; totalfilesrequestednum = 0; totalfilesrequestedsize = 0; +#endif for (i = 0; i < fileneedednum; i++) if (fileneeded[i].status == FS_NOTFOUND || fileneeded[i].status == FS_MD5SUMBAD) { +#ifndef NONET totalfilesrequestednum++; totalfilesrequestedsize += fileneeded[i].totalsize; +#endif } if (totalfilesrequestedsize>>20 >= 100) @@ -2193,11 +2196,9 @@ static boolean CL_FinishedFileList(void) "Press ACCEL to continue or BRAKE to cancel.\n\n" ), downloadsize), M_ConfirmConnect, MM_EVENTHANDLER); - Z_Free(downloadsize); cl_mode = CL_CONFIRMCONNECT; } -#endif #ifdef HAVE_CURL else {