H3cJP/citra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
PabloMK7 2023-07-28 19:05:30 +02:00
parent 5825797a95
commit a9345a3569
3 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/citra_qt/applets/mii_selector.cpp
View File

@ -27,8 +27,7 @@ QtMiiSelectorDialog::QtMiiSelectorDialog(QWidget* parent, QtMiiSelector* mii_sel
? tr("Mii Selector") ? tr("Mii Selector")
: QString::fromStdString(config.title)); : QString::fromStdString(config.title));
miis.push_back( miis.push_back(HLE::Applets::MiiSelector::GetStandardMiiResult().selected_mii_data);
HLE::Applets::MiiSelector::GetStandardMiiResult().selected_mii_data.GetMiiData());
combobox->addItem(tr("Standard Mii")); combobox->addItem(tr("Standard Mii"));
for (const auto& mii : Frontend::LoadMiis()) { for (const auto& mii : Frontend::LoadMiis()) {
miis.push_back(mii); miis.push_back(mii);

2
src/core/frontend/applets/mii_selector.cpp
View File

@ -53,7 +53,7 @@ std::vector<Mii::MiiData> LoadMiis() {
void DefaultMiiSelector::Setup(const Frontend::MiiSelectorConfig& config) { void DefaultMiiSelector::Setup(const Frontend::MiiSelectorConfig& config) {
MiiSelector::Setup(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 } // namespace Frontend

21
src/core/hle/mii.h
View File

@ -187,22 +187,6 @@ static_assert(std::is_trivially_copyable_v<MiiData>, "MiiData must be trivially
class ChecksummedMiiData { class ChecksummedMiiData {
public: 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) { ChecksummedMiiData& operator=(const MiiData& data) {
mii_data = data; mii_data = data;
FixChecksum(); FixChecksum();
@ -225,11 +209,6 @@ public:
u16 CalcChecksum(); u16 CalcChecksum();
private:
MiiData mii_data{};
u16_be unknown{0};
u16_be crc16;
void FixChecksum() { void FixChecksum() {
crc16 = CalcChecksum(); crc16 = CalcChecksum();
} }