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/VolumeWad.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/VolumeWad.cpp')
| -rw-r--r-- | Source/Core/DiscIO/VolumeWad.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Source/Core/DiscIO/VolumeWad.cpp b/Source/Core/DiscIO/VolumeWad.cpp index a6cb48ca77..90ad2045be 100644 --- a/Source/Core/DiscIO/VolumeWad.cpp +++ b/Source/Core/DiscIO/VolumeWad.cpp @@ -16,6 +16,7 @@ #include "Common/MsgHandler.h" #include "Common/StringUtil.h" #include "DiscIO/Blob.h" +#include "DiscIO/Enums.h" #include "DiscIO/Volume.h" #include "DiscIO/VolumeWad.h" @@ -54,10 +55,10 @@ bool CVolumeWAD::Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt) cons return m_pReader->Read(_Offset, _Length, _pBuffer); } -IVolume::ECountry CVolumeWAD::GetCountry() const +Country CVolumeWAD::GetCountry() const { if (!m_pReader) - return COUNTRY_UNKNOWN; + return Country::COUNTRY_UNKNOWN; // read the last digit of the titleID in the ticket u8 country_code; @@ -114,16 +115,16 @@ u16 CVolumeWAD::GetRevision() const return Common::swap16(revision); } -IVolume::EPlatform CVolumeWAD::GetVolumeType() const +Platform CVolumeWAD::GetVolumeType() const { - return WII_WAD; + return Platform::WII_WAD; } -std::map<IVolume::ELanguage, std::string> CVolumeWAD::GetLongNames() const +std::map<Language, std::string> CVolumeWAD::GetLongNames() const { std::vector<u8> name_data(NAMES_TOTAL_BYTES); if (!Read(m_opening_bnr_offset + 0x9C, NAMES_TOTAL_BYTES, name_data.data())) - return std::map<IVolume::ELanguage, std::string>(); + return std::map<Language, std::string>(); return ReadWiiNames(name_data); } |