diff options
| author | JosJuice <josjuice@gmail.com> | 2022-01-08 16:06:49 +0100 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2022-01-08 16:06:49 +0100 |
| commit | 9f3ed1f9f333838a803697cf1f26acc474ae3255 (patch) | |
| tree | b0a8109fd0e81a61ac3c8dbabe60e8efbe0c53cd /Source/Android/app/src/main/java | |
| parent | 5d11dc1926a7c76d8cfcd11d995e24244bdd7e71 (diff) | |
Android: Don't divide SI device by 6
It's a complete coincidence that both SIDEVICE_GC_CONTROLLER (6)
and SIDEVICE_WIIU_ADAPTER (12) are divisible by 6. Dividing
by 6 because of that doesn't make sense, especially not if we
want to add support for more kinds of SI devices on Android later.
Diffstat (limited to 'Source/Android/app/src/main/java')
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityPresenter.java index 478aa3ab42..d4cfee49ac 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityPresenter.java @@ -151,7 +151,7 @@ public final class SettingsActivityPresenter if (value != 0) // Not disabled { Bundle bundle = new Bundle(); - bundle.putInt(SettingsFragmentPresenter.ARG_CONTROLLER_TYPE, value / 6); + bundle.putInt(SettingsFragmentPresenter.ARG_CONTROLLER_TYPE, value); mView.showSettingsFragment(key, bundle, true, mGameId); } } diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java index 5655a67ea8..8943930e5e 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java @@ -833,7 +833,7 @@ public final class SettingsFragmentPresenter private void addGcPadSubSettings(ArrayList<SettingsItem> sl, int gcPadNumber, int gcPadType) { - if (gcPadType == 1) // Emulated + if (gcPadType == 6) // Emulated { sl.add(new HeaderSetting(mContext, R.string.generic_buttons, 0)); sl.add(new InputBindingSetting(mContext, Settings.FILE_DOLPHIN, Settings.SECTION_BINDINGS, @@ -892,7 +892,7 @@ public final class SettingsFragmentPresenter SettingsFile.KEY_EMU_RUMBLE + gcPadNumber, R.string.emulation_control_rumble, mGameID)); } - else // Adapter + else if (gcPadType == 12) // Adapter { LegacyBooleanSetting rumble = new LegacyBooleanSetting(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, SettingsFile.KEY_GCADAPTER_RUMBLE + gcPadNumber, false); |