From c183437dd7c99015d50b1923bad00c46db7e8e96 Mon Sep 17 00:00:00 2001 From: Lugent <35547583+Lugent@users.noreply.github.com> Date: Sat, 18 May 2024 15:24:05 -0400 Subject: [PATCH] Show how many files the server has while checking --- src/netcode/client_connection.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/src/netcode/client_connection.c b/src/netcode/client_connection.c index 917e32b598..e774ca0b8b 100644 --- a/src/netcode/client_connection.c +++ b/src/netcode/client_connection.c @@ -96,7 +96,7 @@ static void CL_DrawConnectionStatus(void) // Draw background fade V_DrawFadeScreen(0xFF00, 16); // force default - if (cl_mode != CL_DOWNLOADFILES && cl_mode != CL_DOWNLOADHTTPFILES && cl_mode != CL_LOADFILES) + if (cl_mode != CL_DOWNLOADFILES && cl_mode != CL_DOWNLOADHTTPFILES && cl_mode != CL_LOADFILES && cl_mode != CL_CHECKFILES && cl_mode != CL_ASKFULLFILELIST) { INT32 animtime = ((ccstime / 4) & 15) + 16; UINT8 palstart; @@ -179,6 +179,31 @@ static void CL_DrawConnectionStatus(void) V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16, V_20TRANS|V_MONOSPACE, va(" %2u/%2u files",loadcompletednum,fileneedednum)); } + else if ((cl_mode == CL_CHECKFILES) || (cl_mode == CL_ASKFULLFILELIST)) + { + INT32 totalfileslength; + INT32 checkcompletednum = 0; + INT32 i; + + V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16-16, V_YELLOWMAP, "Press ESC to abort"); + + //ima just count files here + if (fileneeded) + { + for (i = 0; i < fileneedednum; i++) + if (fileneeded[i].status != FS_NOTCHECKED) + checkcompletednum++; + } + + // Check progress + V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16-24, V_YELLOWMAP, "Checking server addon list..."); + totalfileslength = (INT32)((checkcompletednum/(double)(fileneedednum)) * 256); + M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-16-8, 32, 1); + V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-16, 256, 8, 111); + V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-16, totalfileslength, 8, 96); + V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16, V_20TRANS|V_MONOSPACE, + va(" %2u/%2u Files",checkcompletednum,fileneedednum)); + } else if (filedownload.current != -1) { char tempname[28]; -- GitLab