Kill ->localfile
This commit is contained in:
parent
62e78fbe72
commit
fc53a73f9b
3 changed files with 14 additions and 11 deletions
|
|
@ -167,7 +167,7 @@ UINT8 *PutFileNeeded(UINT16 firstfile)
|
|||
for (; 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 (!wadfiles[i]->important || wadfiles[i]->localfile)
|
||||
if (!wadfiles[i]->important)
|
||||
continue;
|
||||
|
||||
if (firstfile)
|
||||
|
|
@ -563,7 +563,7 @@ INT32 CL_CheckFiles(void)
|
|||
// CONS_Printf("checking %d of %d / %d of %d?\n", i, fileneedednum, j, numwadfiles);
|
||||
// CONS_Printf("i: %s / j: %s \n", fileneeded[i].filename, wadfiles[j]->filename);
|
||||
|
||||
if (j < numwadfiles && (!wadfiles[j]->important || wadfiles[j]->localfile))
|
||||
if (j < numwadfiles && !wadfiles[j]->important)
|
||||
{
|
||||
// Unimportant on our side.
|
||||
++j;
|
||||
|
|
|
|||
20
src/w_wad.c
20
src/w_wad.c
|
|
@ -907,15 +907,20 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup, boole
|
|||
if ((handle = W_OpenWadFile(&filename, true)) == NULL)
|
||||
return W_InitFileError(filename, startup);
|
||||
|
||||
important = W_VerifyNMUSlumps(filename, startup);
|
||||
|
||||
if (important == -1)
|
||||
if (local)
|
||||
important = false;
|
||||
else
|
||||
{
|
||||
fclose(handle);
|
||||
return INT16_MAX;
|
||||
}
|
||||
important = W_VerifyNMUSlumps(filename, startup);
|
||||
|
||||
important = !important;
|
||||
if (important == -1)
|
||||
{
|
||||
fclose(handle);
|
||||
return INT16_MAX;
|
||||
}
|
||||
|
||||
important = !important;
|
||||
}
|
||||
|
||||
#ifndef NOFILEHASH
|
||||
//
|
||||
|
|
@ -981,7 +986,6 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup, boole
|
|||
fseek(handle, 0, SEEK_END);
|
||||
wadfile->filesize = (unsigned)ftell(handle);
|
||||
wadfile->type = type;
|
||||
wadfile->localfile = local;
|
||||
|
||||
// already generated, just copy it over
|
||||
wadfile->hash = filehash;
|
||||
|
|
|
|||
|
|
@ -131,7 +131,6 @@ struct wadfile_t
|
|||
|
||||
boolean important; // also network - !W_VerifyNMUSlumps
|
||||
boolean compatmode;
|
||||
boolean localfile;
|
||||
};
|
||||
|
||||
typedef enum wadcompat
|
||||
|
|
|
|||
Loading…
Reference in a new issue