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.

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

IOS/USB Add 2 more Spaces for Disney Infinity figures #12771

Merged
merged 1 commit into from
Jun 22, 2024

Conversation

deReeperJosh
Copy link
Contributor

This was raised to me by a user that pointed out that you can have 2 "Power Discs" underneath the playset/power disc in the Hexagon space on the infinity base, so I have added 2 more slots to the qt and android UIs, as well as changing the behaviour of one of the C++ methods to allow for this. Removed the infinityListPosition from the Android version, as now the position in the UI list is ordered and doesn't need to have a separate UI list position and backend base position.

@deReeperJosh deReeperJosh changed the title IOS::USB Add 2 more Spaces for Disney Infinity figures IOS/USB Add 2 more Spaces for Disney Infinity figures May 11, 2024
Copy link
Contributor

@AdmiralCurtiss AdmiralCurtiss left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The magic number usage here are really ugly but that's a pre-existing issue, so I suppose this is fine. Though I cannot say whether the change makes sense in the first place.

@deReeperJosh
Copy link
Contributor Author

@AdmiralCurtiss I could convert the numbers in the switch case to an enum for clarity?

@AdmiralCurtiss
Copy link
Contributor

Sure, that would be better, but do it in a separate PR.

@AdmiralCurtiss AdmiralCurtiss merged commit 3e0bd82 into dolphin-emu:master Jun 22, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants