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

Merge pull request #8426 from JosJuice/volumeverifier-region-mismatch 

VolumeVerifier: Improve region/game ID mismatch checking
This commit is contained in:
Mat M 2019-10-23 20:15:31 -04:00 committed by GitHub
parent d95745ffdb 77b9a70d6c
commit 780d34dbca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/DiscIO/VolumeVerifier.cpp
View File

@ -841,20 +841,26 @@ void VolumeVerifier::CheckMisc()
} }
const Region region = m_volume.GetRegion(); const Region region = m_volume.GetRegion();
const Platform platform = m_volume.GetVolumeType();
constexpr std::string_view GAMECUBE_PLACEHOLDER_ID = "RELSAB";
constexpr std::string_view WII_PLACEHOLDER_ID = "RABAZZ";
if (game_id_encrypted.size() < 4) if (game_id_encrypted.size() < 4)
{ {
AddProblem(Severity::Low, Common::GetStringT("The game ID is unusually short.")); AddProblem(Severity::Low, Common::GetStringT("The game ID is unusually short."));
} }
else else if (game_id_encrypted != GAMECUBE_PLACEHOLDER_ID && game_id_encrypted != WII_PLACEHOLDER_ID)
{ {
char country_code; char country_code;
if (IsDisc(m_volume.GetVolumeType())) if (IsDisc(m_volume.GetVolumeType()))
country_code = game_id_encrypted[3]; country_code = game_id_encrypted[3];
else else
country_code = static_cast<char>(m_volume.GetTitleID().value_or(0) & 0xff); country_code = static_cast<char>(m_volume.GetTitleID().value_or(0) & 0xff);
if (CountryCodeToRegion(country_code, platform, region) != region)
const Platform platform = m_volume.GetVolumeType();
const std::optional<u16> revision = m_volume.GetRevision();
if (CountryCodeToRegion(country_code, platform, region, revision) != region)
{ {
AddProblem(Severity::Medium, AddProblem(Severity::Medium,
Common::GetStringT( Common::GetStringT(