stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-14 13:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix file number accounting

Browse source 
Should ensure appropriate accounting and prevent loading of
server files if it would put us over MAX_WADFILES
This commit is contained in:
Ashnal 2020-07-02 20:57:33 -04:00
parent 774b917c0e
commit b8fdd6b89c
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/d_netfil.c
View file

@ -143,7 +143,7 @@ UINT8 *PutFileNeeded(UINT16 firstfile)
char wadfilename[MAX_WADPATH] = ""; char wadfilename[MAX_WADPATH] = "";
UINT8 filestatus; UINT8 filestatus;
for (i = mainwads; i < numwadfiles; i++) for (i = mainwads+1; i < numwadfiles; i++) //mainwads+1, otherwise we start on the first mainwad
{ {
// 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)
@ -430,11 +430,11 @@ INT32 CL_CheckFiles(void)
for (i = 0; i < fileneedednum; i++) for (i = 0; i < fileneedednum; i++)
{ {
if (fileneeded[i].status != FS_OPEN) //little messy, but this will count right by the time we get through the last file
filestoload++;
if (fileneeded[i].status == FS_NOTFOUND) if (fileneeded[i].status == FS_NOTFOUND)
downloadrequired = true; downloadrequired = true;
if (fileneeded[i].status == FS_FOUND || fileneeded[i].status == FS_NOTFOUND)
filestoload++;
if (fileneeded[i].status != FS_NOTCHECKED) //since we're running this over multiple tics now, its possible for us to come across files checked in previous tics if (fileneeded[i].status != FS_NOTCHECKED) //since we're running this over multiple tics now, its possible for us to come across files checked in previous tics
continue; continue;
@ -462,8 +462,8 @@ INT32 CL_CheckFiles(void)
} }
//now making it here means we've checked the entire list and no FS_NOTCHECKED files remain //now making it here means we've checked the entire list and no FS_NOTCHECKED files remain
if (mainwads+filestoload >= MAX_WADFILES) if (numwadfiles+filestoload > MAX_WADFILES)
return 3; //ensure we wouldn't go over the wad limit return 3;
else if (downloadrequired) else if (downloadrequired)
return 0; //some stuff is FS_NOTFOUND, needs download return 0; //some stuff is FS_NOTFOUND, needs download
else else