diff options
| author | 2021-07-05 13:51:00 -0700 | |
|---|---|---|
| committer | 2021-07-05 13:51:00 -0700 | |
| commit | 3d03a6ae0232780ed6fb28e52dbdc5221cb3a7bf (patch) | |
| tree | 43413a941ff3a0dbdc7ba9e515d55e027bd4dfe7 | |
| parent | Merge pull request #6540 from Kelebek1/nvdec (diff) | |
| parent | service: mii: Retrieve the correct default miis. (diff) | |
| download | yuzu-3d03a6ae0232780ed6fb28e52dbdc5221cb3a7bf.tar.gz yuzu-3d03a6ae0232780ed6fb28e52dbdc5221cb3a7bf.tar.xz yuzu-3d03a6ae0232780ed6fb28e52dbdc5221cb3a7bf.zip | |
Merge pull request #6556 from Morph1984/default-mii
service: mii: Retrieve the correct default miis.
| -rw-r--r-- | src/core/hle/service/mii/manager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/hle/service/mii/manager.cpp b/src/core/hle/service/mii/manager.cpp index 114aff31c..869d2763f 100644 --- a/src/core/hle/service/mii/manager.cpp +++ b/src/core/hle/service/mii/manager.cpp | |||
| @@ -20,6 +20,7 @@ namespace { | |||
| 20 | 20 | ||
| 21 | constexpr ResultCode ERROR_CANNOT_FIND_ENTRY{ErrorModule::Mii, 4}; | 21 | constexpr ResultCode ERROR_CANNOT_FIND_ENTRY{ErrorModule::Mii, 4}; |
| 22 | 22 | ||
| 23 | constexpr std::size_t BaseMiiCount{2}; | ||
| 23 | constexpr std::size_t DefaultMiiCount{RawData::DefaultMii.size()}; | 24 | constexpr std::size_t DefaultMiiCount{RawData::DefaultMii.size()}; |
| 24 | 25 | ||
| 25 | constexpr MiiStoreData::Name DefaultMiiName{u'y', u'u', u'z', u'u'}; | 26 | constexpr MiiStoreData::Name DefaultMiiName{u'y', u'u', u'z', u'u'}; |
| @@ -415,7 +416,7 @@ u32 MiiManager::GetCount(SourceFlag source_flag) const { | |||
| 415 | count += 0; | 416 | count += 0; |
| 416 | } | 417 | } |
| 417 | if ((source_flag & SourceFlag::Default) != SourceFlag::None) { | 418 | if ((source_flag & SourceFlag::Default) != SourceFlag::None) { |
| 418 | count += DefaultMiiCount; | 419 | count += (DefaultMiiCount - BaseMiiCount); |
| 419 | } | 420 | } |
| 420 | return static_cast<u32>(count); | 421 | return static_cast<u32>(count); |
| 421 | } | 422 | } |
| @@ -445,7 +446,7 @@ ResultVal<std::vector<MiiInfoElement>> MiiManager::GetDefault(SourceFlag source_ | |||
| 445 | return MakeResult(std::move(result)); | 446 | return MakeResult(std::move(result)); |
| 446 | } | 447 | } |
| 447 | 448 | ||
| 448 | for (std::size_t index = 0; index < DefaultMiiCount; index++) { | 449 | for (std::size_t index = BaseMiiCount; index < DefaultMiiCount; index++) { |
| 449 | result.emplace_back(BuildDefault(index), Source::Default); | 450 | result.emplace_back(BuildDefault(index), Source::Default); |
| 450 | } | 451 | } |
| 451 | 452 | ||