diff options
| author | Matthew Parlane <parlane@gmail.com> | 2017-01-13 09:19:27 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-13 09:19:27 +1300 |
| commit | d346d4ced163502be4d308a6ce8573814454c11c (patch) | |
| tree | f0508438d0776300aeb82fb42a3e305fb4d9303d /Source/Core/DiscIO/VolumeGC.cpp | |
| parent | 34c6672b9788c0bcf39b2f2dfbba0388dd216b64 (diff) | |
| parent | ec969da6bdd8abaa2e43a5a8c1cc7e589997219a (diff) | |
Merge pull request #4544 from JosJuice/region-enum
DiscIO: Add GetRegion function and Region enum
Diffstat (limited to 'Source/Core/DiscIO/VolumeGC.cpp')
| -rw-r--r-- | Source/Core/DiscIO/VolumeGC.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp index 58faed4fe8..fcba359931 100644 --- a/Source/Core/DiscIO/VolumeGC.cpp +++ b/Source/Core/DiscIO/VolumeGC.cpp @@ -61,13 +61,20 @@ std::string CVolumeGC::GetGameID() const return DecodeString(ID); } -Country CVolumeGC::GetCountry() const +Region CVolumeGC::GetRegion() const { - if (!m_pReader) - return Country::COUNTRY_UNKNOWN; + u8 country_code; + if (!m_pReader->Read(3, 1, &country_code)) + return Region::UNKNOWN_REGION; + return RegionSwitchGC(country_code); +} + +Country CVolumeGC::GetCountry() const +{ u8 country_code; - m_pReader->Read(3, 1, &country_code); + if (!m_pReader->Read(3, 1, &country_code)) + return Country::COUNTRY_UNKNOWN; return CountrySwitch(country_code); } @@ -247,7 +254,7 @@ void CVolumeGC::ExtractBannerInformation(const GCBanner& banner_file, bool is_bn if (is_bnr1) // NTSC { - bool is_japanese = GetCountry() == Country::COUNTRY_JAPAN; + bool is_japanese = GetRegion() == Region::NTSC_J; number_of_languages = 1; start_language = is_japanese ? Language::LANGUAGE_JAPANESE : Language::LANGUAGE_ENGLISH; } |