ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VolumeWad: Clean up variable naming

This commit is contained in:
Léo Lam 2017-01-23 18:06:08 +01:00
parent 6d909b3e30
commit 6128679396
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/DiscIO/VolumeWad.cpp
View File

@ -22,7 +22,7 @@
namespace DiscIO namespace DiscIO
{ {
CVolumeWAD::CVolumeWAD(std::unique_ptr<IBlobReader> reader) : m_pReader(std::move(reader)) CVolumeWAD::CVolumeWAD(std::unique_ptr<IBlobReader> reader) : m_reader(std::move(reader))
{ {
// Source: http://wiibrew.org/wiki/WAD_files // Source: http://wiibrew.org/wiki/WAD_files
Read(0x00, 4, (u8*)&m_hdr_size); Read(0x00, 4, (u8*)&m_hdr_size);
@ -44,15 +44,15 @@ CVolumeWAD::~CVolumeWAD()
{ {
} }
bool CVolumeWAD::Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt) const bool CVolumeWAD::Read(u64 offset, u64 length, u8* buffer, bool decrypt) const
{ {
if (decrypt) if (decrypt)
PanicAlertT("Tried to decrypt data from a non-Wii volume"); PanicAlertT("Tried to decrypt data from a non-Wii volume");
if (m_pReader == nullptr) if (m_reader == nullptr)
return false; return false;
return m_pReader->Read(_Offset, _Length, _pBuffer); return m_reader->Read(offset, length, buffer);
} }
Region CVolumeWAD::GetRegion() const Region CVolumeWAD::GetRegion() const
@ -116,7 +116,7 @@ bool CVolumeWAD::GetTitleID(u64* buffer) const
u16 CVolumeWAD::GetRevision() const u16 CVolumeWAD::GetRevision() const
{ {
u16 revision; u16 revision;
if (!m_pReader->Read(m_tmd_offset + 0x1dc, 2, (u8*)&revision)) if (!m_reader->Read(m_tmd_offset + 0x1dc, 2, (u8*)&revision))
return 0; return 0;
return Common::swap16(revision); return Common::swap16(revision);
@ -149,21 +149,21 @@ std::vector<u32> CVolumeWAD::GetBanner(int* width, int* height) const
BlobType CVolumeWAD::GetBlobType() const BlobType CVolumeWAD::GetBlobType() const
{ {
return m_pReader ? m_pReader->GetBlobType() : BlobType::PLAIN; return m_reader ? m_reader->GetBlobType() : BlobType::PLAIN;
} }
u64 CVolumeWAD::GetSize() const u64 CVolumeWAD::GetSize() const
{ {
if (m_pReader) if (m_reader)
return m_pReader->GetDataSize(); return m_reader->GetDataSize();
else else
return 0; return 0;
} }
u64 CVolumeWAD::GetRawSize() const u64 CVolumeWAD::GetRawSize() const
{ {
if (m_pReader) if (m_reader)
return m_pReader->GetRawSize(); return m_reader->GetRawSize();
else else
return 0; return 0;
} }

4
Source/Core/DiscIO/VolumeWad.h
View File

@ -29,7 +29,7 @@ class CVolumeWAD : public IVolume
public: public:
CVolumeWAD(std::unique_ptr<IBlobReader> reader); CVolumeWAD(std::unique_ptr<IBlobReader> reader);
~CVolumeWAD(); ~CVolumeWAD();
bool Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt = false) const override; bool Read(u64 offset, u64 length, u8* buffer, bool decrypt = false) const override;
bool GetTitleID(u64* buffer) const override; bool GetTitleID(u64* buffer) const override;
std::string GetGameID() const override; std::string GetGameID() const override;
std::string GetMakerID() const override; std::string GetMakerID() const override;
@ -48,7 +48,7 @@ public:
u64 GetRawSize() const override; u64 GetRawSize() const override;
private: private:
std::unique_ptr<IBlobReader> m_pReader; std::unique_ptr<IBlobReader> m_reader;
u32 m_offset = 0; u32 m_offset = 0;
u32 m_tmd_offset = 0; u32 m_tmd_offset = 0;
u32 m_opening_bnr_offset = 0; u32 m_opening_bnr_offset = 0;