Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nsyshid: Tidyups and Fixes #1275

Merged
merged 1 commit into from
Jul 28, 2024
Merged

nsyshid: Tidyups and Fixes #1275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Cafe/OS/libs/nsyshid/Skylander.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,7 +978,7 @@ namespace nsyshid
{
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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Cafe/OS/libs/nsyshid/Skylander.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ namespace nsyshid
std::unique_ptr<FileStream> skyFile;
uint8 status = 0;
std::queue<uint8> queuedStatus;
std::array<uint8, SKY_BLOCK_SIZE> data{};
std::array<uint8, SKY_FIGURE_SIZE> data{};
uint32 lastId = 0;
void Save();

Expand Down
2 changes: 1 addition & 1 deletion src/config/CemuConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ struct CemuConfig
struct
{
ConfigValue<bool> emulate_skylander_portal{false};
ConfigValue<bool> emulate_infinity_base{true};
ConfigValue<bool> emulate_infinity_base{false};
}emulated_usb_devices{};

private:
Expand Down
4 changes: 2 additions & 2 deletions src/gui/EmulatedUSBDevices/EmulatedUSBDeviceFrame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ CreateInfinityFigureDialog::CreateInfinityFigureDialog(wxWindow* parent, uint8 s
{
wxMessageDialog idError(this, "Error Converting Figure Number!", "Number Entered is Invalid");
idError.ShowModal();
this->EndModal(0);;
this->EndModal(0);
}
uint32 figNum = longFigNum & 0xFFFFFFFF;
auto figure = nsyshid::g_infinitybase.FindFigure(figNum);
Expand All @@ -408,7 +408,7 @@ CreateInfinityFigureDialog::CreateInfinityFigureDialog(wxWindow* parent, uint8 s
"BIN files (*.bin)|*.bin", wxFD_SAVE | wxFD_OVERWRITE_PROMPT);

if (saveFileDialog.ShowModal() == wxID_CANCEL)
this->EndModal(0);;
this->EndModal(0);

m_filePath = saveFileDialog.GetPath();

Expand Down
Loading