diff options
author | german77 <juangerman-13@hotmail.com> | 2023-09-11 07:17:50 +0200 |
---|---|---|
committer | german77 <juangerman-13@hotmail.com> | 2023-09-11 07:18:08 +0200 |
commit | 36290f9a0ac953ce57a663b5ba817d7e3bb5a33c (patch) | |
tree | 1d659cf2a3e5033ccdff54c9b8af764707db031c /src/core/hle/service/mii/mii_manager.cpp | |
parent | service: mii: Move store data operations (diff) | |
download | yuzu-36290f9a0ac953ce57a663b5ba817d7e3bb5a33c.tar yuzu-36290f9a0ac953ce57a663b5ba817d7e3bb5a33c.tar.gz yuzu-36290f9a0ac953ce57a663b5ba817d7e3bb5a33c.tar.bz2 yuzu-36290f9a0ac953ce57a663b5ba817d7e3bb5a33c.tar.lz yuzu-36290f9a0ac953ce57a663b5ba817d7e3bb5a33c.tar.xz yuzu-36290f9a0ac953ce57a663b5ba817d7e3bb5a33c.tar.zst yuzu-36290f9a0ac953ce57a663b5ba817d7e3bb5a33c.zip |
Diffstat (limited to 'src/core/hle/service/mii/mii_manager.cpp')
-rw-r--r-- | src/core/hle/service/mii/mii_manager.cpp | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/src/core/hle/service/mii/mii_manager.cpp b/src/core/hle/service/mii/mii_manager.cpp index dd7af531e..2137a9af1 100644 --- a/src/core/hle/service/mii/mii_manager.cpp +++ b/src/core/hle/service/mii/mii_manager.cpp @@ -21,18 +21,10 @@ namespace { constexpr std::size_t DefaultMiiCount{RawData::DefaultMii.size()}; -constexpr Nickname DefaultMiiName{u'n', u'o', u' ', u'n', u'a', u'm', u'e'}; - -template <typename T, std::size_t SourceArraySize, std::size_t DestArraySize> -std::array<T, DestArraySize> ResizeArray(const std::array<T, SourceArraySize>& in) { - std::array<T, DestArraySize> out{}; - std::memcpy(out.data(), in.data(), sizeof(T) * std::min(SourceArraySize, DestArraySize)); - return out; -} - CharInfo ConvertStoreDataToInfo(const StoreData& data) { - // Next Commit Will fix this one - return {}; + CharInfo char_info{}; + char_info.SetFromStoreData(data); + return char_info; } StoreData BuildRandomStoreData(Age age, Gender gender, Race race, const Common::UUID& user_id) { @@ -112,14 +104,14 @@ CharInfo MiiManager::ConvertV3ToCharInfo(const Ver3StoreData& mii_v3) const { NfpStoreDataExtension MiiManager::SetFromStoreData(const CharInfo& mii) const { return { - .faceline_color = static_cast<u8>(mii.faceline_color & 0xf), - .hair_color = static_cast<u8>(mii.hair_color & 0x7f), - .eye_color = static_cast<u8>(mii.eyebrow_color & 0x7f), - .eyebrow_color = static_cast<u8>(mii.eyebrow_color & 0x7f), - .mouth_color = static_cast<u8>(mii.mouth_color & 0x7f), - .beard_color = static_cast<u8>(mii.beard_color & 0x7f), - .glass_color = static_cast<u8>(mii.glasses_color & 0x7f), - .glass_type = static_cast<u8>(mii.glasses_type & 0x1f), + .faceline_color = static_cast<u8>(mii.GetFacelineColor() & 0xf), + .hair_color = static_cast<u8>(mii.GetHairColor() & 0x7f), + .eye_color = static_cast<u8>(mii.GetEyeColor() & 0x7f), + .eyebrow_color = static_cast<u8>(mii.GetEyebrowColor() & 0x7f), + .mouth_color = static_cast<u8>(mii.GetMouthColor() & 0x7f), + .beard_color = static_cast<u8>(mii.GetBeardColor() & 0x7f), + .glass_color = static_cast<u8>(mii.GetGlassColor() & 0x7f), + .glass_type = static_cast<u8>(mii.GetGlassType() & 0x1f), }; } |