diff options
| author | JosJuice <josjuice@gmail.com> | 2016-07-06 20:33:05 +0200 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2016-07-13 17:29:27 +0200 |
| commit | 0a15aaaa123482ecf7b2490a13e33a884416d51c (patch) | |
| tree | 3ba5c883fb2a16ae29b77a6dac575642d41582e7 /Source/Core/DiscIO/NANDContentLoader.cpp | |
| parent | baf9abe9115fe444689f9a773fe814b1fc83956d (diff) | |
Move DiscIO enums to a new file
At first there weren't many enums in Volume.h, but the number has been
growing, and I'm planning to add one more for regions. To not make
Volume.h too large, and to avoid needing to include Volume.h in code
that doesn't use volume objects, I'm moving the enums to a new file.
I'm also turning them into enum classes while I'm at it.
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); } |