From 03150e5fe6998ac6beeb1cf600057326465894b1 Mon Sep 17 00:00:00 2001 From: Ashnal Date: Mon, 17 Aug 2020 03:56:13 -0400 Subject: [PATCH] Move declaration to appease C90 also remove some extra tab characters --- src/d_clisrv.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 3d910d9e..bb3fb3e1 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -1241,15 +1241,16 @@ static inline void CL_DrawConnectionStatus(void) if (cl_mode == CL_LOADFILES) { INT32 totalfileslength; + INT32 loadcompletednum = 0; + INT32 i; + V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-24, V_YELLOWMAP, "Press ESC to abort"); //ima just count files here - INT32 loadcompletednum = 0; - INT32 i; for (i = 0; i < fileneedednum; i++) if (fileneeded[i].status == FS_OPEN) loadcompletednum++; - + // Loading progress V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-32, V_YELLOWMAP, "Loading server addons..."); totalfileslength = (INT32)((loadcompletednum/(double)(fileneedednum)) * 256); @@ -1279,8 +1280,6 @@ static inline void CL_DrawConnectionStatus(void) V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-58, 256, 8, 175); V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-58, dldlength, 8, 160); - - memset(tempname, 0, sizeof(tempname)); // offset filename to just the name only part filename += strlen(filename) - nameonlylength(filename); @@ -1323,7 +1322,7 @@ static inline void CL_DrawConnectionStatus(void) else V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE, va(" %4uK/%4uK",totaldldsize>>10,totalfilesrequestedsize>>10)); - + V_DrawRightAlignedString(BASEVIDWIDTH/2+128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE, va("%2u/%2u Files ",downloadcompletednum,totalfilesrequestednum)); }