Skip to content

Commit 517e68f

Browse files
authored
nsyshid: Tidyups and Fixes (#1275)
1 parent 593da5e commit 517e68f

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

src/Cafe/OS/libs/nsyshid/Skylander.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -978,7 +978,7 @@ namespace nsyshid
978978
{
979979
for (const auto& it : GetListSkylanders())
980980
{
981-
if(it.first.first == skyId && it.first.second == skyVar)
981+
if (it.first.first == skyId && it.first.second == skyVar)
982982
{
983983
return it.second;
984984
}

src/Cafe/OS/libs/nsyshid/Skylander.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ namespace nsyshid
5050
std::unique_ptr<FileStream> skyFile;
5151
uint8 status = 0;
5252
std::queue<uint8> queuedStatus;
53-
std::array<uint8, SKY_BLOCK_SIZE> data{};
53+
std::array<uint8, SKY_FIGURE_SIZE> data{};
5454
uint32 lastId = 0;
5555
void Save();
5656

src/config/CemuConfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ struct CemuConfig
519519
struct
520520
{
521521
ConfigValue<bool> emulate_skylander_portal{false};
522-
ConfigValue<bool> emulate_infinity_base{true};
522+
ConfigValue<bool> emulate_infinity_base{false};
523523
}emulated_usb_devices{};
524524

525525
private:

src/gui/EmulatedUSBDevices/EmulatedUSBDeviceFrame.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ CreateInfinityFigureDialog::CreateInfinityFigureDialog(wxWindow* parent, uint8 s
398398
{
399399
wxMessageDialog idError(this, "Error Converting Figure Number!", "Number Entered is Invalid");
400400
idError.ShowModal();
401-
this->EndModal(0);;
401+
this->EndModal(0);
402402
}
403403
uint32 figNum = longFigNum & 0xFFFFFFFF;
404404
auto figure = nsyshid::g_infinitybase.FindFigure(figNum);
@@ -408,7 +408,7 @@ CreateInfinityFigureDialog::CreateInfinityFigureDialog(wxWindow* parent, uint8 s
408408
"BIN files (*.bin)|*.bin", wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
409409

410410
if (saveFileDialog.ShowModal() == wxID_CANCEL)
411-
this->EndModal(0);;
411+
this->EndModal(0);
412412

413413
m_filePath = saveFileDialog.GetPath();
414414

0 commit comments

Comments
 (0)