ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7192 from MikeRavenelle/master 

Removed iterative input from the option group. It already exists in t…
This commit is contained in:
spycrab 2018-06-30 21:52:03 +02:00 committed by GitHub
parent e23a2e3063 8218de0762
commit c1f404fa35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/HW/GCKeyboardEmu.cpp
View File

@ -80,8 +80,6 @@ GCKeyboard::GCKeyboard(const unsigned int index) : m_index(index)
// options // options
groups.emplace_back(m_options = new ControllerEmu::ControlGroup(_trans("Options"))); groups.emplace_back(m_options = new ControllerEmu::ControlGroup(_trans("Options")));
m_options->boolean_settings.emplace_back(std::make_unique<ControllerEmu::BooleanSetting>(
_trans("Iterative Input"), false, ControllerEmu::SettingType::VIRTUAL));
} }
std::string GCKeyboard::GetName() const std::string GCKeyboard::GetName() const

2
Source/Core/Core/HW/GCPadEmu.cpp
View File

@ -98,8 +98,6 @@ GCPad::GCPad(const unsigned int index) : m_index(index)
// i18n: Treat a controller as always being connected regardless of what // i18n: Treat a controller as always being connected regardless of what
// devices the user actually has plugged in // devices the user actually has plugged in
m_always_connected = new ControllerEmu::BooleanSetting(_trans("Always Connected"), false)); m_always_connected = new ControllerEmu::BooleanSetting(_trans("Always Connected"), false));
m_options->boolean_settings.emplace_back(std::make_unique<ControllerEmu::BooleanSetting>(
_trans("Iterative Input"), false, ControllerEmu::SettingType::VIRTUAL));
} }
std::string GCPad::GetName() const std::string GCPad::GetName() const

2
Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
View File

@ -314,8 +314,6 @@ Wiimote::Wiimote(const unsigned int index) : m_index(index), ir_sin(0), ir_cos(1
m_options->boolean_settings.emplace_back( m_options->boolean_settings.emplace_back(
m_upright_setting = new ControllerEmu::BooleanSetting("Upright Wiimote", m_upright_setting = new ControllerEmu::BooleanSetting("Upright Wiimote",
_trans("Upright Wii Remote"), false)); _trans("Upright Wii Remote"), false));
m_options->boolean_settings.emplace_back(std::make_unique<ControllerEmu::BooleanSetting>(
_trans("Iterative Input"), false, ControllerEmu::SettingType::VIRTUAL));
m_options->numeric_settings.emplace_back( m_options->numeric_settings.emplace_back(
std::make_unique<ControllerEmu::NumericSetting>(_trans("Speaker Pan"), 0, -127, 127)); std::make_unique<ControllerEmu::NumericSetting>(_trans("Speaker Pan"), 0, -127, 127));
m_options->numeric_settings.emplace_back( m_options->numeric_settings.emplace_back(