piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-22 22:00:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

DiscIO: Add GetRegion function and Region enum

Browse Source 
Instead of needing different switch cases for
converting countries to regions in multiple places,
we now only need a single country-to-region switch case
(in DiscIO/Enums.cpp), and we get a nice Region type.
This commit is contained in:
JosJuice
2016-12-23 18:41:21 +01:00
parent 6aef0630f7
commit 66ea9f5cc1
26 changed files with 218 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
Source/Core/DiscIO/VolumeWiiCrypted.cpp
View File

@ -153,51 +153,38 @@ std::string CVolumeWiiCrypted::GetGameID() const
return DecodeString(ID);
}
Region CVolumeWiiCrypted::GetRegion() const
{
u32 region_code;
if (!ReadSwapped(0x4E000, &region_code, false))
return Region::UNKNOWN_REGION;
return static_cast<Region>(region_code);
}
Country CVolumeWiiCrypted::GetCountry() const
{
if (!m_pReader)
return Country::COUNTRY_UNKNOWN;
u8 country_byte;
if (!m_pReader->Read(3, 1, &country_byte))
return Country::COUNTRY_UNKNOWN;
Country country_value = CountrySwitch(country_byte);
const Region region = GetRegion();
u32 region_code;
if (!ReadSwapped(0x4E000, &region_code, false))
return country_value;
if (RegionSwitchWii(country_byte) == region)
return CountrySwitch(country_byte);
switch (region_code)
switch (region)
{
case 0:
switch (country_value)
{
case Country::COUNTRY_TAIWAN:
return Country::COUNTRY_TAIWAN;
default:
return Country::COUNTRY_JAPAN;
}
case 1:
case Region::NTSC_J:
return Country::COUNTRY_JAPAN;
case Region::NTSC_U:
return Country::COUNTRY_USA;
case 2:
switch (country_value)
{
case Country::COUNTRY_FRANCE:
case Country::COUNTRY_GERMANY:
case Country::COUNTRY_ITALY:
case Country::COUNTRY_NETHERLANDS:
case Country::COUNTRY_RUSSIA:
case Country::COUNTRY_SPAIN:
case Country::COUNTRY_AUSTRALIA:
return country_value;
default:
return Country::COUNTRY_EUROPE;
}
case 4:
case Region::PAL:
return Country::COUNTRY_EUROPE;
case Region::NTSC_K:
return Country::COUNTRY_KOREA;
default:
return country_value;
return Country::COUNTRY_UNKNOWN;
}
}