zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-23 04:22:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed a few issues from implicit FileReader conversion.

Browse source
This commit is contained in:
Christoph Oelckers 2018-03-10 20:47:17 +01:00
parent b315bc3be0
commit 6f8ca2eace
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/files.h
View file

@ -514,7 +514,7 @@ public:
FileRdr() {}
// These two functions are only needed as long as the FileReader has not been fully replaced throughout the code.
FileRdr(FileReader *r)
explicit FileRdr(FileReader *r)
{
mReader = r;
}

12
src/sound/i_soundfont.cpp
View file

@ -119,11 +119,12 @@ FSF2Reader::FSF2Reader(const char *fn)
FileRdr FSF2Reader::OpenMainConfigFile()
{
FileRdr fr;
if (mMainConfigForSF2.IsNotEmpty())
{
return new MemoryReader(mMainConfigForSF2.GetChars(), (long)mMainConfigForSF2.Len());
fr.OpenMemory(mMainConfigForSF2.GetChars(), mMainConfigForSF2.Len());
}
return nullptr;
return fr;
}
FileRdr FSF2Reader::OpenFile(const char *name)
@ -159,15 +160,16 @@ FileRdr FZipPatReader::OpenMainConfigFile()
FileRdr FZipPatReader::OpenFile(const char *name)
{
FileRdr fr;
if (resf != nullptr)
{
auto lump = resf->FindLump(name);
if (lump != nullptr)
{
return lump->NewReader();
return FileRdr(lump->NewReader()); // temporary workaround
}
}
return nullptr;
return fr;
}
//==========================================================================
@ -258,7 +260,7 @@ FLumpPatchSetReader::FLumpPatchSetReader(const char *filename)
FileRdr FLumpPatchSetReader::OpenMainConfigFile()
{
return Wads.ReopenLumpNum(mLumpIndex);
return Wads.ReopenLumpReader(mLumpIndex);
}
FileRdr FLumpPatchSetReader::OpenFile(const char *name)