piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

WiiWad: Allow using WiiWad with more than just files

Browse Source 
This adds a WiiWad constructor that takes a BlobReader, so that the
class can be used with more than just files from the host filesystem.

Required for using WiiWad with WADs from update partitions.
This commit is contained in:
Léo Lam 2017-07-04 15:37:41 +02:00
parent 5976d3934d
commit ca0438e26d
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Core/DiscIO/WiiWad.cpp
View File

@ -44,21 +44,18 @@ bool IsWiiWAD(BlobReader& reader)
}
} // Anonymous namespace
WiiWAD::WiiWAD(const std::string& name) : m_reader(CreateBlobReader(name))
{
if (m_reader == nullptr)
{
m_valid = false;
return;
}
m_valid = ParseWAD();
}
WiiWAD::~WiiWAD()
WiiWAD::WiiWAD(const std::string& name) : WiiWAD(CreateBlobReader(name))
{
}
WiiWAD::WiiWAD(std::unique_ptr<BlobReader> blob_reader) : m_reader(std::move(blob_reader))
{
if (m_reader)
m_valid = ParseWAD();
}
WiiWAD::~WiiWAD() = default;
bool WiiWAD::ParseWAD()
{
if (!IsWiiWAD(*m_reader))

3
Source/Core/DiscIO/WiiWad.h
View File

@ -19,6 +19,7 @@ class WiiWAD
{
public:
explicit WiiWAD(const std::string& name);
explicit WiiWAD(std::unique_ptr<BlobReader> blob_reader);
~WiiWAD();
bool IsValid() const { return m_valid; }
@ -32,7 +33,7 @@ public:
private:
bool ParseWAD();
bool m_valid;
bool m_valid = false;
std::unique_ptr<BlobReader> m_reader;