mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-25 05:21:02 +00:00
- fixed some compile errors which were only reported on GCC/Clang.
This commit is contained in:
parent
b445347aca
commit
8c0925dd5d
2 changed files with 15 additions and 10 deletions
|
@ -323,13 +323,17 @@ FResourceFile *FResourceFile::OpenDirectory(const char *filename, bool quiet)
|
||||||
//
|
//
|
||||||
//==========================================================================
|
//==========================================================================
|
||||||
|
|
||||||
FResourceFile::FResourceFile(const char *filename, FileReader &r)
|
FResourceFile::FResourceFile(const char *filename)
|
||||||
{
|
{
|
||||||
if (filename != NULL) Filename = copystring(filename);
|
if (filename != NULL) Filename = copystring(filename);
|
||||||
else Filename = NULL;
|
else Filename = NULL;
|
||||||
Reader = std::move(r);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
FResourceFile::FResourceFile(const char *filename, FileReader &r)
|
||||||
|
: FResourceFile(filename)
|
||||||
|
{
|
||||||
|
Reader = std::move(r);
|
||||||
|
}
|
||||||
|
|
||||||
FResourceFile::~FResourceFile()
|
FResourceFile::~FResourceFile()
|
||||||
{
|
{
|
||||||
|
@ -642,11 +646,13 @@ int FUncompressedLump::FillCache()
|
||||||
//
|
//
|
||||||
//==========================================================================
|
//==========================================================================
|
||||||
|
|
||||||
|
FUncompressedFile::FUncompressedFile(const char *filename)
|
||||||
|
: FResourceFile(filename)
|
||||||
|
{}
|
||||||
|
|
||||||
FUncompressedFile::FUncompressedFile(const char *filename, FileReader &r)
|
FUncompressedFile::FUncompressedFile(const char *filename, FileReader &r)
|
||||||
: FResourceFile(filename, r)
|
: FResourceFile(filename, r)
|
||||||
{
|
{}
|
||||||
Lumps = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
FUncompressedFile::~FUncompressedFile()
|
FUncompressedFile::~FUncompressedFile()
|
||||||
{
|
{
|
||||||
|
|
|
@ -86,6 +86,7 @@ public:
|
||||||
protected:
|
protected:
|
||||||
uint32_t NumLumps;
|
uint32_t NumLumps;
|
||||||
|
|
||||||
|
FResourceFile(const char *filename);
|
||||||
FResourceFile(const char *filename, FileReader &r);
|
FResourceFile(const char *filename, FileReader &r);
|
||||||
|
|
||||||
// for archives that can contain directories
|
// for archives that can contain directories
|
||||||
|
@ -131,14 +132,12 @@ struct FUncompressedLump : public FResourceLump
|
||||||
class FUncompressedFile : public FResourceFile
|
class FUncompressedFile : public FResourceFile
|
||||||
{
|
{
|
||||||
protected:
|
protected:
|
||||||
FUncompressedLump * Lumps;
|
FUncompressedLump * Lumps = nullptr;
|
||||||
|
|
||||||
|
|
||||||
|
FUncompressedFile(const char *filename);
|
||||||
FUncompressedFile(const char *filename, FileReader &r);
|
FUncompressedFile(const char *filename, FileReader &r);
|
||||||
virtual ~FUncompressedFile();
|
virtual ~FUncompressedFile();
|
||||||
virtual FResourceLump *GetLump(int no) { return ((unsigned)no < NumLumps)? &Lumps[no] : NULL; }
|
virtual FResourceLump *GetLump(int no) { return ((unsigned)no < NumLumps)? &Lumps[no] : NULL; }
|
||||||
|
|
||||||
public:
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue