stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-02-05 16:01:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Wait, we don't need pages, just first file index...

Browse source
This commit is contained in:
fickleheart 2019-04-17 23:51:15 -05:00
parent a36700e176
commit 0e2bef3f1a
4 changed files with 17 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_clisrv.c
View file

@ -2029,7 +2029,7 @@ static boolean CL_ServerConnectionSearchTicker(boolean viams, tic_t *asksent)
if (client) if (client)
{ {
D_ParseFileneeded(serverlist[i].info.fileneedednum, serverlist[i].info.fileneeded, 0); D_ParseFileneeded(serverlist[i].info.fileneedednum, serverlist[i].info.fileneeded, 0);
if (serverlist[i].info.fileneedednum & FILENEEDED_MORE) if (serverlist[i].info.kartvars & SV_LOTSOFADDONS)
{ {
cl_mode = CL_ASKFULLFILELIST; cl_mode = CL_ASKFULLFILELIST;
return true; return true;

3
src/d_clisrv.h
View file

@ -371,13 +371,12 @@ typedef struct
} ATTRPACK joinchallenge_pak; } ATTRPACK joinchallenge_pak;
#define SV_SPEEDMASK 0x03 #define SV_SPEEDMASK 0x03
#define SV_LOTSOFADDONS 0x20
#define SV_DEDICATED 0x40 #define SV_DEDICATED 0x40
#define SV_PASSWORD 0x80 #define SV_PASSWORD 0x80
#define MAXSERVERNAME 32 #define MAXSERVERNAME 32
#define MAXFILENEEDED 915 #define MAXFILENEEDED 915
#define MAXFILENEEDEDPAGES MAX_WADFILES
#define FILENEEDED_MORE 0x80
// This packet is too large // This packet is too large
typedef struct typedef struct
{ {

35
src/d_netfil.c
View file

@ -101,46 +101,39 @@ char downloaddir[512] = "DOWNLOAD";
INT32 lastfilenum = -1; INT32 lastfilenum = -1;
#endif #endif
UINT16 fileneededpages = 0;
static size_t fileneededpagestart[MAXFILENEEDEDPAGES];
/** Fills a serverinfo packet with information about wad files loaded. /** Fills a serverinfo packet with information about wad files loaded.
* *
* \todo Give this function a better name since it is in global scope. * \todo Give this function a better name since it is in global scope.
* Used to have size limiting built in - now handed via W_LoadWadFile in w_wad.c * Used to have size limiting built in - now handed via W_LoadWadFile in w_wad.c
* *
*/ */
UINT8 *PutFileNeeded(UINT16 page) UINT8 *PutFileNeeded(UINT16 firstfile)
{ {
size_t i; size_t i;
UINT8 count = 0; UINT8 count = 0;
UINT8 *p = netbuffer->u.serverinfo.fileneeded; UINT8 *p_start = netbuffer->u.serverinfo.fileneeded;
UINT8 *p = p_start;
char wadfilename[MAX_WADPATH] = ""; char wadfilename[MAX_WADPATH] = "";
UINT8 filestatus; UINT8 filestatus;
if (page > fileneededpages) for (i = mainwads; i < numwadfiles; i++)
I_Error("Fileneeded page %d accessed before a prior page", page);
else if (page == 0)
{
fileneededpages = 0;
memset(fileneededpagestart, 0, sizeof(fileneededpagestart)); // ??? I guess.
fileneededpagestart[0] = mainwads;
}
for (i = fileneededpagestart[page]; i < (fileneededpagestart[page+1] ?: numwadfiles); i++)
{ {
// If it has only music/sound lumps, don't put it in the list // If it has only music/sound lumps, don't put it in the list
if (!wadfiles[i]->important) if (!wadfiles[i]->important)
continue; continue;
if (firstfile)
{ // Skip files until we reach the first file.
firstfile--;
continue;
}
nameonly(strcpy(wadfilename, wadfiles[i]->filename)); nameonly(strcpy(wadfilename, wadfiles[i]->filename));
if (p + 1 + 4 + strlen(wadfilename) + 16 > netbuffer->u.serverinfo.fileneeded + MAXFILENEEDED) if (p + 1 + 4 + strlen(wadfilename) + 16 > p_start + MAXFILENEEDED)
{ {
// Too many files for this page, so mark the next page to start here and finish up. // Too many files to send all at once
fileneededpagestart[page+1] = i; netbuffer->u.serverinfo.kartvars |= SV_LOTSOFADDONS;
fileneededpages = page+1;
count |= FILENEEDED_MORE;
break; break;
} }
@ -178,7 +171,7 @@ void D_ParseFileneeded(INT32 fileneedednum_parm, UINT8 *fileneededstr, UINT16 fi
UINT8 *p; UINT8 *p;
UINT8 filestatus; UINT8 filestatus;
fileneedednum = firstfile + (fileneedednum_parm & ~FILENEEDED_MORE); fileneedednum = firstfile + fileneedednum_parm;
p = (UINT8 *)fileneededstr; p = (UINT8 *)fileneededstr;
for (i = firstfile; i < fileneedednum; i++) for (i = firstfile; i < fileneedednum; i++)
{ {

3
src/d_netfil.h
View file

@ -53,8 +53,7 @@ extern char downloaddir[512];
extern INT32 lastfilenum; extern INT32 lastfilenum;
#endif #endif
extern UINT16 fileneededpages; UINT8 *PutFileNeeded(UINT16 firstfile);
UINT8 *PutFileNeeded(UINT16 page);
void D_ParseFileneeded(INT32 fileneedednum_parm, UINT8 *fileneededstr, UINT16 firstfile); void D_ParseFileneeded(INT32 fileneedednum_parm, UINT8 *fileneededstr, UINT16 firstfile);
void CL_PrepareDownloadSaveGame(const char *tmpsave); void CL_PrepareDownloadSaveGame(const char *tmpsave);