piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12771 from deReeperJosh/moreinfinityslots

Browse Source 
IOS/USB Add 2 more Spaces for Disney Infinity figures
This commit is contained in:
Admiral H. Curtiss
2024-06-22 20:03:26 +02:00
committed by GitHub
parent d49304a629 a87ea694a9
commit 3e0bd82f81
7 changed files with 74 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Core/DolphinQt/InfinityBase/InfinityBaseWindow.cpp
View File

@ -79,17 +79,21 @@ void InfinityBaseWindow::CreateMainWindow()
AddFigureSlot(vbox_group, tr("Play Set/Power Disc"), 0);
add_line(vbox_group);
AddFigureSlot(vbox_group, tr("Player One"), 1);
AddFigureSlot(vbox_group, tr("Power Disc Two"), 1);
add_line(vbox_group);
AddFigureSlot(vbox_group, tr("Player One Ability One"), 3);
AddFigureSlot(vbox_group, tr("Power Disc Three"), 2);
add_line(vbox_group);
AddFigureSlot(vbox_group, tr("Player One"), 3);
add_line(vbox_group);
AddFigureSlot(vbox_group, tr("Player One Ability One"), 4);
add_line(vbox_group);
AddFigureSlot(vbox_group, tr("Player One Ability Two"), 5);
add_line(vbox_group);
AddFigureSlot(vbox_group, tr("Player Two"), 2);
AddFigureSlot(vbox_group, tr("Player Two"), 6);
add_line(vbox_group);
AddFigureSlot(vbox_group, tr("Player Two Ability One"), 4);
AddFigureSlot(vbox_group, tr("Player Two Ability One"), 7);
add_line(vbox_group);
AddFigureSlot(vbox_group, tr("Player Two Ability Two"), 6);
AddFigureSlot(vbox_group, tr("Player Two Ability Two"), 8);
m_group_figures->setLayout(vbox_group);
scroll_area->setWidget(m_group_figures);
@ -203,8 +207,9 @@ CreateFigureDialog::CreateFigureDialog(QWidget* parent, u8 slot) : QDialog(paren
// Only display entry if it is a piece appropriate for the slot
if ((slot == 0 &&
((figure > 0x1E8480 && figure < 0x2DC6BF) || (figure > 0x3D0900 && figure < 0x4C4B3F))) ||
((slot == 1 || slot == 2) && figure < 0x1E847F) ||
((slot == 3 || slot == 4 || slot == 5 || slot == 6) &&
((slot == 1 || slot == 2) && (figure > 0x3D0900 && figure < 0x4C4B3F)) ||
((slot == 3 || slot == 6) && figure < 0x1E847F) ||
((slot == 4 || slot == 5 || slot == 7 || slot == 8) &&
(figure > 0x2DC6C0 && figure < 0x3D08FF)))
{
const auto figure_name = QString::fromStdString(entry.first);

2
Source/Core/DolphinQt/InfinityBase/InfinityBaseWindow.h
View File

@ -28,7 +28,7 @@ public:
~InfinityBaseWindow() override;
protected:
std::array<QLineEdit*, 7> m_edit_figures;
std::array<QLineEdit*, 9> m_edit_figures;
private:
void CreateMainWindow();