summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorspycrab <spycrab@users.noreply.github.com>2018-07-02 15:15:53 +0200
committerspycrab <spycrab@users.noreply.github.com>2018-07-02 15:27:03 +0200
commit3e2e8136072f4c58dae12dc569f7cd4cf627ee8b (patch)
treeee96391b404eedcbc4aeca7f3fa933d3fd92eded
parentc7c93a8e8027085d2b8fd6b7c6acc73595e6a2c0 (diff)
HW/WiimoteEmu: Make "Upright / Sideways Wii Remote" mutually exclusive
-rw-r--r--Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
index 1b435328e6..72e6dc3bed 100644
--- 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_sideways_setting = new ControllerEmu::BooleanSetting("Sideways Wiimote",
- _trans("Sideways Wii Remote"), false));
- m_options->boolean_settings.emplace_back(
- m_upright_setting = new ControllerEmu::BooleanSetting("Upright Wiimote",
- _trans("Upright Wii Remote"), false));
+ m_options->boolean_settings.emplace_back(m_upright_setting = new ControllerEmu::BooleanSetting(
+ "Upright Wiimote", _trans("Upright Wii Remote"),
+ true, ControllerEmu::SettingType::NORMAL, true));
+ m_options->boolean_settings.emplace_back(m_sideways_setting = new ControllerEmu::BooleanSetting(
+ "Sideways Wiimote", _trans("Sideways Wii Remote"),
+ 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(