Skip to content

Commit e2048bd

Browse files
committed
fixed loading of embedded files from directories.
1 parent 4f8207a commit e2048bd

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

source/common/filesystem/source/filesystem.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,10 +391,10 @@ void FileSystem::AddFile (const char *filename, FileReader *filer, LumpFilterInf
391391
int flags = resfile->GetEntryFlags(i);
392392
if (flags & RESFF_EMBEDDED)
393393
{
394+
auto embedded = resfile->GetEntryReader(i, READER_NEW, READERFLAG_SEEKABLE);
394395
std::string path = filename;
395-
path += ':';
396+
if (embedded.GetBuffer()) path += ':';
396397
path += resfile->getName(i);
397-
auto embedded = resfile->GetEntryReader(i, READER_NEW, READERFLAG_SEEKABLE);
398398
AddFile(path.c_str(), &embedded, filter, Printf, hashfile);
399399
}
400400
}

source/core/initfs.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,10 +428,12 @@ void InitFileSystem(TArray<GrpEntry>& groups)
428428
LumpFilterInfo lfi;
429429
lfi.reservedFolders = { "textures/", "hires/", "sounds/", "music/", "maps/" };
430430
for (auto p = iwad_reserved(); *p; p++) lfi.requiredPrefixes.push_back(*p);
431+
#if 0
431432
if (isBlood())
432433
{
433434
lfi.embeddings = { "blood.rff", "sounds.rff" };
434435
}
436+
#endif
435437

436438
if (isDukeEngine()) lfi.gameTypeFilter.push_back("DukeEngine");
437439
if (isDukeLike()) lfi.gameTypeFilter.push_back("DukeLike");

0 commit comments

Comments
 (0)