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/NANDContentLoader.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/NANDContentLoader.cpp')
| -rw-r--r-- | Source/Core/DiscIO/NANDContentLoader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/DiscIO/NANDContentLoader.cpp b/Source/Core/DiscIO/NANDContentLoader.cpp index 5b3057efbf..2c5e0e87e7 100644 --- a/Source/Core/DiscIO/NANDContentLoader.cpp +++ b/Source/Core/DiscIO/NANDContentLoader.cpp @@ -311,12 +311,12 @@ std::vector<u8> CNANDContentLoader::GetKeyFromTicket(const std::vector<u8>& tick return AESDecode(common_key, iv, &ticket[0x01BF], 16); } -DiscIO::Country CNANDContentLoader::GetCountry() const +DiscIO::Region CNANDContentLoader::GetRegion() const { if (!IsValid()) - return DiscIO::Country::COUNTRY_UNKNOWN; + return DiscIO::Region::UNKNOWN_REGION; - return CountrySwitch(m_Country); + return RegionSwitchWii(m_Country); } CNANDContentManager::~CNANDContentManager() |