mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-30 15:32:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VolumeWad: Private variables for offset values

Browse Source
This commit is contained in:
Stevoisiak 2015-02-23 19:48:25 -05:00
parent ae9a63479f
commit d3190ec4f1
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,8 +19,8 @@
namespace DiscIO namespace DiscIO
{ {
CVolumeWAD::CVolumeWAD(IBlobReader* _pReader) CVolumeWAD::CVolumeWAD(IBlobReader* _pReader)
: m_pReader(_pReader), m_opening_bnr_offset(0), m_hdr_size(0) : m_pReader(_pReader), m_offset(0), m_tmd_offset(0), m_opening_bnr_offset(0),
, m_cert_size(0), m_tick_size(0), m_tmd_size(0), m_data_size(0) m_hdr_size(0), m_cert_size(0), m_tick_size(0), m_tmd_size(0), m_data_size(0)
{ {
Read(0x00, 4, (u8*)&m_hdr_size); Read(0x00, 4, (u8*)&m_hdr_size);
Read(0x08, 4, (u8*)&m_cert_size); Read(0x08, 4, (u8*)&m_cert_size);
@ -28,14 +28,16 @@ CVolumeWAD::CVolumeWAD(IBlobReader* _pReader)
Read(0x14, 4, (u8*)&m_tmd_size); Read(0x14, 4, (u8*)&m_tmd_size);
Read(0x18, 4, (u8*)&m_data_size); Read(0x18, 4, (u8*)&m_data_size);
u32 TmdOffset = ALIGN_40(m_hdr_size) + ALIGN_40(m_cert_size) + ALIGN_40(m_tick_size); m_offset = ALIGN_40(m_hdr_size) + ALIGN_40(m_cert_size);
m_opening_bnr_offset = TmdOffset + ALIGN_40(m_tmd_size) + ALIGN_40(m_data_size); m_tmd_offset = ALIGN_40(m_hdr_size) + ALIGN_40(m_cert_size) + ALIGN_40(m_tick_size);
m_opening_bnr_offset = m_tmd_offset + ALIGN_40(m_tmd_size) + ALIGN_40(m_data_size);
// read the last digit of the titleID in the ticket // read the last digit of the titleID in the ticket
Read(TmdOffset + 0x0193, 1, &m_Country); Read(m_tmd_offset + 0x0193, 1, &m_Country);
if (m_Country == 2) // SYSMENU if (m_Country == 2) // SYSMENU
{ {
u16 titlever = 0; u16 titlever = 0;
Read(TmdOffset + 0x01dc, 2, (u8*)&titlever); Read(m_tmd_offset + 0x01dc, 2, (u8*)&titlever);
m_Country = GetSysMenuRegion(Common::swap16(titlever)); m_Country = GetSysMenuRegion(Common::swap16(titlever));
} }
} }
@ -66,10 +68,9 @@ IVolume::ECountry CVolumeWAD::GetCountry() const
std::string CVolumeWAD::GetUniqueID() const std::string CVolumeWAD::GetUniqueID() const
{ {
std::string temp = GetMakerID(); std::string temp = GetMakerID();
u32 Offset = ALIGN_40(m_hdr_size) + ALIGN_40(m_cert_size);
char GameCode[8]; char GameCode[8];
if (!Read(Offset + 0x01E0, 4, (u8*)GameCode)) if (!Read(m_offset + 0x01E0, 4, (u8*)GameCode))
return "0"; return "0";
GameCode[4] = temp.at(0); GameCode[4] = temp.at(0);
@ -81,11 +82,9 @@ std::string CVolumeWAD::GetUniqueID() const
std::string CVolumeWAD::GetMakerID() const std::string CVolumeWAD::GetMakerID() const
{ {
u32 Offset = ALIGN_40(m_hdr_size) + ALIGN_40(m_cert_size) + ALIGN_40(m_tick_size);
char temp[3] = {1}; char temp[3] = {1};
// Some weird channels use 0x0000 in place of the MakerID, so we need a check there // Some weird channels use 0x0000 in place of the MakerID, so we need a check there
if (!Read(0x198 + Offset, 2, (u8*)temp) || temp[0] == 0 || temp[1] == 0) if (!Read(0x198 + m_tmd_offset, 2, (u8*)temp) || temp[0] == 0 || temp[1] == 0)
return "00"; return "00";
temp[2] = 0; temp[2] = 0;
@ -95,9 +94,7 @@ std::string CVolumeWAD::GetMakerID() const
bool CVolumeWAD::GetTitleID(u8* _pBuffer) const bool CVolumeWAD::GetTitleID(u8* _pBuffer) const
{ {
u32 Offset = ALIGN_40(m_hdr_size) + ALIGN_40(m_cert_size); if (!Read(m_offset + 0x01DC, 8, _pBuffer))
if (!Read(Offset + 0x01DC, 8, _pBuffer))
return false; return false;
return true; return true;
@ -105,10 +102,8 @@ bool CVolumeWAD::GetTitleID(u8* _pBuffer) const
int CVolumeWAD::GetRevision() const int CVolumeWAD::GetRevision() const
{ {
u32 TmdOffset = ALIGN_40(m_hdr_size) + ALIGN_40(m_cert_size) + ALIGN_40(m_tick_size);
u16 revision; u16 revision;
if (!m_pReader->Read(TmdOffset + 0x1dc, 2, (u8*)&revision)) if (!m_pReader->Read(m_tmd_offset + 0x1dc, 2, (u8*)&revision))
return 0; return 0;
return Common::swap16(revision); return Common::swap16(revision);

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

@ -40,6 +40,8 @@ public:
private: private:
std::unique_ptr<IBlobReader> m_pReader; std::unique_ptr<IBlobReader> m_pReader;
u32 m_offset;
u32 m_tmd_offset;
u32 m_opening_bnr_offset; u32 m_opening_bnr_offset;
u32 m_hdr_size; u32 m_hdr_size;
u32 m_cert_size; u32 m_cert_size;