* Made PK3s fail the music lump check, because... that method of checking doesn't really work with it.
* Improve the output of listwad to identify unimportant, non-networked files. https://cdn.discordapp.com/attachments/237467298590490625/371314970002063370/srb20044.png * Fixed mainwads being one too high due to the removal of rings.dta.
This commit is contained in:
parent
50d6208913
commit
3a96c507a2
|
@ -1135,14 +1135,14 @@ void D_SRB2Main(void)
|
||||||
//W_VerifyFileMD5(1, ASSET_HASH_ZONES_DTA); // zones.dta
|
//W_VerifyFileMD5(1, ASSET_HASH_ZONES_DTA); // zones.dta
|
||||||
//W_VerifyFileMD5(2, ASSET_HASH_PLAYER_DTA); // player.dta
|
//W_VerifyFileMD5(2, ASSET_HASH_PLAYER_DTA); // player.dta
|
||||||
#ifdef USE_PATCH_DTA
|
#ifdef USE_PATCH_DTA
|
||||||
W_VerifyFileMD5(4, ASSET_HASH_PATCH_DTA); // patch.dta
|
W_VerifyFileMD5(3, ASSET_HASH_PATCH_DTA); // patch.dta
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// don't check music.dta because people like to modify it, and it doesn't matter if they do
|
// don't check music.dta because people like to modify it, and it doesn't matter if they do
|
||||||
// ...except it does if they slip maps in there, and that's what W_VerifyNMUSlumps is for.
|
// ...except it does if they slip maps in there, and that's what W_VerifyNMUSlumps is for.
|
||||||
#endif //ifndef DEVELOP
|
#endif //ifndef DEVELOP
|
||||||
|
|
||||||
mainwads = 4; // there are 4 wads not to unload
|
mainwads = 3; // there are 3 wads not to unload
|
||||||
#ifdef USE_PATCH_DTA
|
#ifdef USE_PATCH_DTA
|
||||||
++mainwads; // patch.dta adds one more
|
++mainwads; // patch.dta adds one more
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -3242,6 +3242,8 @@ static void Command_ListWADS_f(void)
|
||||||
CONS_Printf("\x82 IWAD\x80: %s\n", tempname);
|
CONS_Printf("\x82 IWAD\x80: %s\n", tempname);
|
||||||
else if (i <= mainwads)
|
else if (i <= mainwads)
|
||||||
CONS_Printf("\x82 * %.2d\x80: %s\n", i, tempname);
|
CONS_Printf("\x82 * %.2d\x80: %s\n", i, tempname);
|
||||||
|
else if (!wadfiles[i]->important)
|
||||||
|
CONS_Printf("\x86 %.2d: %s\n", i, tempname);
|
||||||
else
|
else
|
||||||
CONS_Printf(" %.2d: %s\n", i, tempname);
|
CONS_Printf(" %.2d: %s\n", i, tempname);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1481,12 +1481,12 @@ static int W_VerifyFile(const char *filename, lumpchecklist_t *checklist,
|
||||||
if ((handle = W_OpenWadFile(&filename, false)) == NULL)
|
if ((handle = W_OpenWadFile(&filename, false)) == NULL)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
// detect dehacked file with the "soc" extension
|
// detect wad file by the absence of the other supported extensions
|
||||||
if (stricmp(&filename[strlen(filename) - 4], ".soc") != 0
|
if (stricmp(&filename[strlen(filename) - 4], ".soc")
|
||||||
#ifdef HAVE_BLUA
|
#ifdef HAVE_BLUA
|
||||||
&& stricmp(&filename[strlen(filename) - 4], ".lua") != 0
|
&& stricmp(&filename[strlen(filename) - 4], ".lua")
|
||||||
#endif
|
#endif
|
||||||
)
|
&& stricmp(&filename[strlen(filename) - 4], ".pk3"))
|
||||||
{
|
{
|
||||||
// assume wad file
|
// assume wad file
|
||||||
wadinfo_t header;
|
wadinfo_t header;
|
||||||
|
|
Loading…
Reference in a new issue