archive/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu synced 2024-09-20 03:11:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

nsyshid: Tidyups and Fixes (#1275)

Browse source
This commit is contained in:
Joshua de Reeper 2024-07-28 17:50:20 +01:00 committed by GitHub
parent 593da5ed79
commit 517e68fe57
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Cafe/OS/libs/nsyshid/Skylander.cpp
View file

@ -978,7 +978,7 @@ namespace nsyshid
{ {
for (const auto& it : GetListSkylanders()) for (const auto& it : GetListSkylanders())
{ {
if(it.first.first == skyId && it.first.second == skyVar) if (it.first.first == skyId && it.first.second == skyVar)
{ {
return it.second; return it.second;
} }

2
src/Cafe/OS/libs/nsyshid/Skylander.h
View file

@ -50,7 +50,7 @@ namespace nsyshid
std::unique_ptr<FileStream> skyFile; std::unique_ptr<FileStream> skyFile;
uint8 status = 0; uint8 status = 0;
std::queue<uint8> queuedStatus; std::queue<uint8> queuedStatus;
std::array<uint8, SKY_BLOCK_SIZE> data{}; std::array<uint8, SKY_FIGURE_SIZE> data{};
uint32 lastId = 0; uint32 lastId = 0;
void Save(); void Save();

2
src/config/CemuConfig.h
View file

@ -519,7 +519,7 @@ struct CemuConfig
struct struct
{ {
ConfigValue<bool> emulate_skylander_portal{false}; ConfigValue<bool> emulate_skylander_portal{false};
ConfigValue<bool> emulate_infinity_base{true}; ConfigValue<bool> emulate_infinity_base{false};
}emulated_usb_devices{}; }emulated_usb_devices{};
private: private:

4
src/gui/EmulatedUSBDevices/EmulatedUSBDeviceFrame.cpp
View file

@ -398,7 +398,7 @@ CreateInfinityFigureDialog::CreateInfinityFigureDialog(wxWindow* parent, uint8 s
{ {
wxMessageDialog idError(this, "Error Converting Figure Number!", "Number Entered is Invalid"); wxMessageDialog idError(this, "Error Converting Figure Number!", "Number Entered is Invalid");
idError.ShowModal(); idError.ShowModal();
this->EndModal(0);; this->EndModal(0);
} }
uint32 figNum = longFigNum & 0xFFFFFFFF; uint32 figNum = longFigNum & 0xFFFFFFFF;
auto figure = nsyshid::g_infinitybase.FindFigure(figNum); auto figure = nsyshid::g_infinitybase.FindFigure(figNum);
@ -408,7 +408,7 @@ CreateInfinityFigureDialog::CreateInfinityFigureDialog(wxWindow* parent, uint8 s
"BIN files (*.bin)|*.bin", wxFD_SAVE | wxFD_OVERWRITE_PROMPT); "BIN files (*.bin)|*.bin", wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
if (saveFileDialog.ShowModal() == wxID_CANCEL) if (saveFileDialog.ShowModal() == wxID_CANCEL)
this->EndModal(0);; this->EndModal(0);
m_filePath = saveFileDialog.GetPath(); m_filePath = saveFileDialog.GetPath();