diff options
Diffstat (limited to 'Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp')
| -rw-r--r-- | Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp index ca010b5ae4..32aa92bd08 100644 --- a/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp +++ b/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp @@ -16,6 +16,7 @@ // http://code.google.com/p/dolphin-emu/ #include "VolumeWiiCrypted.h" +#include "VolumeGC.h" #include "StringUtil.h" #include "Crypto/sha1.h" @@ -168,21 +169,17 @@ std::string CVolumeWiiCrypted::GetMakerID() const return makerID; } -std::string CVolumeWiiCrypted::GetName() const +std::vector<std::string> CVolumeWiiCrypted::GetNames() const { - if (m_pReader == NULL) - { - return std::string(); - } - - char name[0xFF]; + std::vector<std::string> names; + + auto const string_decoder = CVolumeGC::GetStringDecoder(GetCountry()); - if (!Read(0x20, 0x60, (u8*)&name)) - { - return std::string(); - } + char name[0xFF] = {}; + if (m_pReader != NULL && Read(0x20, 0x60, (u8*)&name)) + names.push_back(string_decoder(name)); - return name; + return names; } u32 CVolumeWiiCrypted::GetFSTSize() const |