OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- fixed setup of IPK3's where all content is in a subdirectory.

Browse source 
These never received the file name list that was needed to eliminate this directory from internal paths.
This commit is contained in:
Christoph Oelckers 2020-04-19 13:04:29 +02:00
commit 6dfc416b51
2 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/d_iwad.cpp
View file

@ -263,6 +263,8 @@ void FIWadManager::ParseIWadInfo(const char *fn, const char *data, int datasize,
// Look for IWAD definition lump
//
//==========================================================================
extern const char* iwad_folders[13];
extern const char* iwad_reserved[12];
FIWadManager::FIWadManager(const char *firstfn, const char *optfn)
{
@ -352,7 +354,13 @@ int FIWadManager::CheckIWADInfo(const char* fn)
{
FileSystem check;
check.InitSingleFile(fn, true);
LumpFilterInfo lfi;
for (auto p : iwad_folders) lfi.reservedFolders.Push(p);
for (auto p : iwad_reserved) lfi.requiredPrefixes.Push(p);
TArray<FString> filenames;
filenames.Push(fn);
check.InitMultipleFiles(filenames, true, &lfi);
if (check.GetNumEntries() > 0)
{
int num = check.CheckNumForName("IWADINFO");