HW/WiimoteEmu: Make "Upright / Sideways Wii Remote" mutually exclusive

dolphin-emu · Jul 2, 2018 · 3e2e813 · 3e2e813
1 parent c7c93a8
commit 3e2e813
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
@@ -49,7 +49,7 @@ namespace
 // :)
 auto const TAU = 6.28318530717958647692;
 auto const PI = TAU / 2.0;
-}
+}  // namespace
 
 namespace WiimoteEmu
 {
@@ -308,12 +308,13 @@ Wiimote::Wiimote(const unsigned int index) : m_index(index), ir_sin(0), ir_cos(1
 
   // options
   groups.emplace_back(m_options = new ControllerEmu::ControlGroup(_trans("Options")));
-  m_options->boolean_settings.emplace_back(
+  m_options->boolean_settings.emplace_back(m_upright_setting = new ControllerEmu::BooleanSetting(
-      m_sideways_setting = new ControllerEmu::BooleanSetting("Sideways Wiimote",
+                                               "Upright Wiimote", _trans("Upright Wii Remote"),
-                                                             _trans("Sideways Wii Remote"), false));
+                                               true, ControllerEmu::SettingType::NORMAL, true));
-  m_options->boolean_settings.emplace_back(
+  m_options->boolean_settings.emplace_back(m_sideways_setting = new ControllerEmu::BooleanSetting(
-      m_upright_setting = new ControllerEmu::BooleanSetting("Upright Wiimote",
+                                               "Sideways Wiimote", _trans("Sideways Wii Remote"),
-                                                            _trans("Upright Wii Remote"), false));
+                                               false, ControllerEmu::SettingType::NORMAL, true));
+
   m_options->numeric_settings.emplace_back(
       std::make_unique<ControllerEmu::NumericSetting>(_trans("Speaker Pan"), 0, -127, 127));
   m_options->numeric_settings.emplace_back(