delet CLIENT_LOADINGSCREEN

This commit is contained in:
Alug committed 2025-09-30 19:35:01 +02:00
1 parent 508de14ad4
commit 5be5ae3f5f
4 files changed
-25

No files matched your search

-13
View File
@@ -54,11 +54,9 @@
#include "d_main.h"
#include "r_fps.h"
#ifdef CLIENT_LOADINGSCREEN
// cl loading screen
#include "v_video.h"
#include "f_finale.h"
#endif
#ifdef HAVE_DISCORDRPC
#include "discord.h"
@@ -1165,8 +1163,6 @@ static void CV_LoadPlayerNames(UINT8 **p)
}
}
#ifdef CLIENT_LOADINGSCREEN
//
// CL_DrawConnectionStatus
//
@@ -1501,7 +1497,6 @@ static inline void CL_DrawConnectionStatus(void)
}
}
}
#endif
static boolean CL_AskFileList(INT32 firstfile)
{
@@ -2778,7 +2773,6 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
}
*oldtic = I_GetTime();
#ifdef CLIENT_LOADINGSCREEN
if (client && cl_mode != CL_CONNECTED && cl_mode != CL_ABORTED)
{
F_TitleScreenTicker(true);
@@ -2795,10 +2789,6 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
if (moviemode)
M_SaveFrame();
}
#else
CON_Drawer();
I_UpdateNoVsync();
#endif
}
else
{
@@ -2823,10 +2813,7 @@ static void CL_ConnectToServer(void)
sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home);
#ifdef CLIENT_LOADINGSCREEN
filedownload.current = -1;
#endif
cl_mode = CL_SEARCHING;
// Don't get a corrupt savegame error because tmpsave already exists
-4
View File
@@ -230,9 +230,7 @@ void D_ParseFileneeded(INT32 fileneedednum_parm, UINT8 *fileneededstr, UINT16 fi
void CL_PrepareDownloadSaveGame(const char *tmpsave)
{
#ifdef CLIENT_LOADINGSCREEN
filedownload.current = -1;
#endif
fileneedednum = 1;
fileneeded[0].status = FS_REQUESTED;
fileneeded[0].justdownloaded = false;
@@ -1045,9 +1043,7 @@ void Got_Filetxpak(void)
filetime = 0;
}
#ifdef CLIENT_LOADINGSCREEN
filedownload.current = filenum;
#endif
}
/** \brief Checks if a node is downloading a file
-5
View File
@@ -59,19 +59,15 @@ extern char downloaddir[512];
typedef struct
{
#ifdef CLIENT_LOADINGSCREEN
INT32 current;
INT32 completednum;
UINT32 completedsize;
INT32 totalnum;
UINT32 totalsize;
#endif
#ifdef HAVE_CURL
INT32 remaining;
boolean http_failed;
boolean http_running;
char http_source[MAX_MIRROR_LENGTH+1];
#endif
} file_download_t;
@@ -79,7 +75,6 @@ typedef struct
extern file_download_t filedownload;
#ifdef HAVE_CURL
typedef struct HTTP_login HTTP_login;
extern struct HTTP_login
-3
View File
@@ -632,9 +632,6 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
/// Most modifications should probably enable this.
//#define SAVEGAME_OTHERVERSIONS
/// Display a connection screen on join attempts.
#define CLIENT_LOADINGSCREEN
/// Backwards compatibility with musicslots.
/// \note You should leave this enabled unless you're working with a future SRB2 version.
#define MUSICSLOT_COMPATIBILITY