diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2016-07-13 19:51:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-13 19:51:01 +0200 |
| commit | 014037ebb7897bd7051bdd9b76128fbc20db1674 (patch) | |
| tree | 2a47fb496d72d5c72413b6433afc4006fdc4aa02 /Source/Core/DiscIO/NANDContentLoader.cpp | |
| parent | 89a03174ccfcc0dc80c9f59b84338f508919a555 (diff) | |
| parent | 0a15aaaa123482ecf7b2490a13e33a884416d51c (diff) | |
Merge pull request #3983 from JosJuice/discio-enums
Move DiscIO enums to a new file
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 36f672b026..7e108f98e2 100644 --- a/Source/Core/DiscIO/NANDContentLoader.cpp +++ b/Source/Core/DiscIO/NANDContentLoader.cpp @@ -23,8 +23,8 @@ #include "Common/NandPaths.h" #include "Common/StringUtil.h" +#include "DiscIO/Enums.h" #include "DiscIO/NANDContentLoader.h" -#include "DiscIO/Volume.h" #include "DiscIO/WiiWad.h" namespace DiscIO @@ -303,10 +303,10 @@ std::vector<u8> CNANDContentLoader::GetKeyFromTicket(const std::vector<u8>& tick return AESDecode(common_key, iv, &ticket[0x01BF], 16); } -DiscIO::IVolume::ECountry CNANDContentLoader::GetCountry() const +DiscIO::Country CNANDContentLoader::GetCountry() const { if (!IsValid()) - return DiscIO::IVolume::COUNTRY_UNKNOWN; + return DiscIO::Country::COUNTRY_UNKNOWN; return CountrySwitch(m_Country); } |