OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- transition to new FileReader interface complete, but untested.

Browse source
This commit is contained in:
Christoph Oelckers 2018-03-11 12:33:46 +01:00
commit b14ee50d0d
31 changed files with 1253 additions and 1708 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/sound/i_soundfont.cpp
View file

@ -145,7 +145,7 @@ FileRdr FSF2Reader::OpenFile(const char *name)
FZipPatReader::FZipPatReader(const char *filename)
{
resf = FResourceFile::OpenResourceFile(filename, nullptr, true);
resf = FResourceFile::OpenResourceFile(filename, true);
}
FZipPatReader::~FZipPatReader()
@ -166,7 +166,7 @@ FileRdr FZipPatReader::OpenFile(const char *name)
auto lump = resf->FindLump(name);
if (lump != nullptr)
{
return FileRdr(lump->NewReader()); // temporary workaround
return lump->NewReader();
}
}
return fr;
@ -306,7 +306,7 @@ void FSoundFontManager::ProcessOneFile(const FString &fn)
}
else if (!memcmp(head, "PK", 2))
{
auto zip = FResourceFile::OpenResourceFile(fn, nullptr, true);
auto zip = FResourceFile::OpenResourceFile(fn, true);
if (zip != nullptr)
{
if (zip->LumpCount() > 1) // Anything with just one lump cannot possibly be a packed GUS patch set so skip it right away and simplify the lookup code