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

DiscIO: Rename RegionSwitch/CountrySwitch

Browse Source 
Callers don't need to know that these functions are implemented
with a switch statement.
This commit is contained in:
JosJuice
2018-10-08 13:51:21 +02:00
parent 7fd1784b9a
commit f834ef1dfe
7 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DiscIO/Enums.cpp
View File

@ -145,7 +145,7 @@ Country TypicalCountryForRegion(Region region)
}
}
Region RegionSwitch(u8 country_code, Platform platform, Region expected_region)
Region CountryCodeToRegion(u8 country_code, Platform platform, Region expected_region)
{
switch (country_code)
{
@ -198,7 +198,7 @@ Region RegionSwitch(u8 country_code, Platform platform, Region expected_region)
}
}
Country CountrySwitch(u8 country_code, Platform platform, Region region)
Country CountryCodeToCountry(u8 country_code, Platform platform, Region region)
{
switch (country_code)
{

5
Source/Core/DiscIO/Enums.h
View File

@ -77,8 +77,9 @@ bool IsNTSC(Region region);
Country TypicalCountryForRegion(Region region);
// Avoid using this function if you can. Country codes aren't always reliable region indicators.
Region RegionSwitch(u8 country_code, Platform platform, Region expected_region = Region::Unknown);
Country CountrySwitch(u8 country_code, Platform platform, Region region = Region::Unknown);
Region CountryCodeToRegion(u8 country_code, Platform platform,
Region expected_region = Region::Unknown);
Country CountryCodeToCountry(u8 country_code, Platform platform, Region region = Region::Unknown);
Region GetSysMenuRegion(u16 title_version);
std::string GetSysMenuVersionString(u16 title_version);

4
Source/Core/DiscIO/VolumeGC.cpp
View File

@ -87,10 +87,10 @@ Country VolumeGC::GetCountry(const Partition& partition) const
const u8 country = ReadSwapped<u8>(3, partition).value_or(0);
const Region region = GetRegion();
if (RegionSwitch(country, Platform::GameCubeDisc, region) != region)
if (CountryCodeToRegion(country, Platform::GameCubeDisc, region) != region)
return TypicalCountryForRegion(region);
return CountrySwitch(country, Platform::GameCubeDisc, region);
return CountryCodeToCountry(country, Platform::GameCubeDisc, region);
}
std::string VolumeGC::GetMakerID(const Partition& partition) const

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

@ -88,7 +88,7 @@ Country VolumeWAD::GetCountry(const Partition& partition) const
if (country_code == 2) // SYSMENU
return TypicalCountryForRegion(GetSysMenuRegion(m_tmd.GetTitleVersion()));
return CountrySwitch(country_code, Platform::WiiWAD);
return CountryCodeToCountry(country_code, Platform::WiiWAD);
}
const IOS::ES::TMDReader& VolumeWAD::GetTMD(const Partition& partition) const

4
Source/Core/DiscIO/VolumeWii.cpp
View File

@ -293,10 +293,10 @@ Country VolumeWii::GetCountry(const Partition& partition) const
const u8 country_byte = ReadSwapped<u8>(3, partition).value_or(0);
const Region region = GetRegion();
if (RegionSwitch(country_byte, Platform::WiiDisc, region) != region)
if (CountryCodeToRegion(country_byte, Platform::WiiDisc, region) != region)
return TypicalCountryForRegion(region);
return CountrySwitch(country_byte, Platform::WiiDisc, region);
return CountryCodeToCountry(country_byte, Platform::WiiDisc, region);
}
std::string VolumeWii::GetMakerID(const Partition& partition) const