diff options
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))); } } } |