diff options
| author | zackhow <zackhow@gmail.com> | 2018-07-27 20:03:00 -0400 |
|---|---|---|
| committer | zackhow <zackhow@gmail.com> | 2018-07-29 21:24:28 -0400 |
| commit | 38c8d970f21b612e14da9889797c9f4ad433b90b (patch) | |
| tree | 0bcd75e586814b2ca699972efe854057d2cec086 /Source/Android/app/src/main/java | |
| parent | 7c2d2548a88abf9a5fa0bff52e00c57d093a9e19 (diff) | |
Android: Fix emulated wiimotes via controller
A little background: Android has 8 controller setup, 4 gamecube pads and 4 wiimote pads. When the static GCPadNew.ini and wiimotenew.ini is created, pads 0-3 are gc 1-4, and 4-7 are wii 1-4. Problem was the settings set wii controllers as pads 1-4, instead of 4-7. So any setting for wiimote1, was set for gc2(padID 1). Which is why the only wiimote to work was 4, since it mapped to padID 4, which is actually wiimote1.
Diffstat (limited to 'Source/Android/app/src/main/java')
2 files changed, 10 insertions, 10 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/MenuTag.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/MenuTag.java index 9f1adf0aed..00582c34f7 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/MenuTag.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/MenuTag.java @@ -18,14 +18,14 @@ public enum MenuTag GCPAD_2("gcpad", 1), GCPAD_3("gcpad", 2), GCPAD_4("gcpad", 3), - WIIMOTE_1("wiimote", 1), - WIIMOTE_2("wiimote", 2), - WIIMOTE_3("wiimote", 3), - WIIMOTE_4("wiimote", 4), - WIIMOTE_EXTENSION_1("wiimote_extension", 1), - WIIMOTE_EXTENSION_2("wiimote_extension", 2), - WIIMOTE_EXTENSION_3("wiimote_extension", 3), - WIIMOTE_EXTENSION_4("wiimote_extension", 4); + WIIMOTE_1("wiimote", 4), + WIIMOTE_2("wiimote", 5), + WIIMOTE_3("wiimote", 6), + WIIMOTE_4("wiimote", 7), + WIIMOTE_EXTENSION_1("wiimote_extension", 4), + WIIMOTE_EXTENSION_2("wiimote_extension", 5), + WIIMOTE_EXTENSION_3("wiimote_extension", 6), + WIIMOTE_EXTENSION_4("wiimote_extension", 7); private String tag; private int subType = -1; diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java index 66bc8db68c..784460a9cc 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java @@ -329,11 +329,11 @@ public final class SettingsFragmentPresenter { if (!mSettings.get(SettingsFile.SETTINGS_WIIMOTE).isEmpty()) { - for (int i = 1; i <= 4; i++) + for (int i = 0; i < 4; i++) { // TODO This wiimote_0 + i business is quite the hack. It should work, but only if the definitions are kept together and in order. Setting wiimoteSetting = mSettings.get(SettingsFile.SETTINGS_WIIMOTE).get(SettingsFile.SECTION_WIIMOTE + i).getSetting(SettingsFile.KEY_WIIMOTE_TYPE); - sl.add(new SingleChoiceSetting(SettingsFile.KEY_WIIMOTE_TYPE, SettingsFile.SECTION_WIIMOTE + i, SettingsFile.SETTINGS_WIIMOTE, R.string.wiimote_0 + i - 1, 0, R.array.wiimoteTypeEntries, R.array.wiimoteTypeValues, 0, wiimoteSetting, MenuTag.getWiimoteMenuTag(i))); + sl.add(new SingleChoiceSetting(SettingsFile.KEY_WIIMOTE_TYPE, SettingsFile.SECTION_WIIMOTE + i, SettingsFile.SETTINGS_WIIMOTE, R.string.wiimote_4 + i, 0, R.array.wiimoteTypeEntries, R.array.wiimoteTypeValues, 0, wiimoteSetting, MenuTag.getWiimoteMenuTag(i+4))); } } } |