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

VolumeWad: Move country identification to GetCountry() 

Brings the code more in line with the rest of the game volume code
This commit is contained in:
Stevoisiak 2015-02-23 19:50:19 -05:00
parent d3190ec4f1
commit df2f6d137e
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,15 +31,6 @@ CVolumeWAD::CVolumeWAD(IBlobReader* _pReader)
m_offset = ALIGN_40(m_hdr_size) + ALIGN_40(m_cert_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(m_tmd_offset + 0x0193, 1, &m_Country);
if (m_Country == 2) // SYSMENU
{
u16 titlever = 0;
Read(m_tmd_offset + 0x01dc, 2, (u8*)&titlever);
m_Country = GetSysMenuRegion(Common::swap16(titlever));
}
}
CVolumeWAD::~CVolumeWAD()
@ -62,7 +53,18 @@ IVolume::ECountry CVolumeWAD::GetCountry() const
if (!m_pReader)
return COUNTRY_UNKNOWN;
return CountrySwitch(m_Country);
// read the last digit of the titleID in the ticket
u8 CountryCode;
Read(m_tmd_offset + 0x0193, 1, &CountryCode);
if (CountryCode == 2) // SYSMENU
{
u16 titlever = 0;
Read(m_tmd_offset + 0x01dc, 2, (u8*)&titlever);
CountryCode = GetSysMenuRegion(Common::swap16(titlever));
}
return CountrySwitch(CountryCode);
}
std::string CVolumeWAD::GetUniqueID() const

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

@ -48,7 +48,6 @@ private:
u32 m_tick_size;
u32 m_tmd_size;
u32 m_data_size;
u8 m_Country;
};
} // namespace