diff --git a/src/citra_qt/applets/mii_selector.cpp b/src/citra_qt/applets/mii_selector.cpp index f0bcbbae54..199b3f9247 100644 --- a/src/citra_qt/applets/mii_selector.cpp +++ b/src/citra_qt/applets/mii_selector.cpp @@ -27,8 +27,7 @@ QtMiiSelectorDialog::QtMiiSelectorDialog(QWidget* parent, QtMiiSelector* mii_sel ? tr("Mii Selector") : QString::fromStdString(config.title)); - miis.push_back( - HLE::Applets::MiiSelector::GetStandardMiiResult().selected_mii_data.GetMiiData()); + miis.push_back(HLE::Applets::MiiSelector::GetStandardMiiResult().selected_mii_data); combobox->addItem(tr("Standard Mii")); for (const auto& mii : Frontend::LoadMiis()) { miis.push_back(mii); diff --git a/src/core/frontend/applets/mii_selector.cpp b/src/core/frontend/applets/mii_selector.cpp index fcbc18213b..13a864f68d 100644 --- a/src/core/frontend/applets/mii_selector.cpp +++ b/src/core/frontend/applets/mii_selector.cpp @@ -53,7 +53,7 @@ std::vector LoadMiis() { void DefaultMiiSelector::Setup(const Frontend::MiiSelectorConfig& config) { MiiSelector::Setup(config); - Finalize(0, HLE::Applets::MiiSelector::GetStandardMiiResult().selected_mii_data.GetMiiData()); + Finalize(0, HLE::Applets::MiiSelector::GetStandardMiiResult().selected_mii_data); } } // namespace Frontend diff --git a/src/core/hle/mii.h b/src/core/hle/mii.h index d911d77fe3..ae1da5e98a 100644 --- a/src/core/hle/mii.h +++ b/src/core/hle/mii.h @@ -187,22 +187,6 @@ static_assert(std::is_trivially_copyable_v, "MiiData must be trivially class ChecksummedMiiData { public: - ChecksummedMiiData() { - FixChecksum(); - } - ChecksummedMiiData(const ChecksummedMiiData& data) = default; - ChecksummedMiiData(ChecksummedMiiData&& data) = default; - ChecksummedMiiData& operator=(const ChecksummedMiiData&) = default; - ChecksummedMiiData& operator=(ChecksummedMiiData&&) = default; - - ChecksummedMiiData(const MiiData& data) : mii_data(data) { - FixChecksum(); - } - - ChecksummedMiiData(MiiData&& data) : mii_data(data) { - FixChecksum(); - } - ChecksummedMiiData& operator=(const MiiData& data) { mii_data = data; FixChecksum(); @@ -225,11 +209,6 @@ public: u16 CalcChecksum(); -private: - MiiData mii_data{}; - u16_be unknown{0}; - u16_be crc16; - void FixChecksum() { crc16 = CalcChecksum(); }