diff --git a/source/common/filesystem/source/filesystem.cpp b/source/common/filesystem/source/filesystem.cpp index b931920e9..f0c5e108d 100644 --- a/source/common/filesystem/source/filesystem.cpp +++ b/source/common/filesystem/source/filesystem.cpp @@ -391,10 +391,10 @@ void FileSystem::AddFile (const char *filename, FileReader *filer, LumpFilterInf int flags = resfile->GetEntryFlags(i); if (flags & RESFF_EMBEDDED) { - std::string path = filename; - path += ':'; - path += resfile->getName(i); auto embedded = resfile->GetEntryReader(i, READER_NEW, READERFLAG_SEEKABLE); + std::string path = filename; + if (embedded.GetBuffer()) path += ':'; + path += resfile->getName(i); AddFile(path.c_str(), &embedded, filter, Printf, hashfile); } } diff --git a/source/core/initfs.cpp b/source/core/initfs.cpp index 7254f0e17..9e47401b1 100644 --- a/source/core/initfs.cpp +++ b/source/core/initfs.cpp @@ -428,10 +428,12 @@ void InitFileSystem(TArray& groups) LumpFilterInfo lfi; lfi.reservedFolders = { "textures/", "hires/", "sounds/", "music/", "maps/" }; for (auto p = iwad_reserved(); *p; p++) lfi.requiredPrefixes.push_back(*p); +#if 0 if (isBlood()) { lfi.embeddings = { "blood.rff", "sounds.rff" }; } +#endif if (isDukeEngine()) lfi.gameTypeFilter.push_back("DukeEngine"); if (isDukeLike()) lfi.gameTypeFilter.push_back("DukeLike");