Merge pull request #810 from lioncash/controller-interface

InputCommon: Don't base default radius of analog sticks off of their name

1 files changed, 3 insertions, 7 deletions

diff --git a/Source/Core/InputCommon/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu.cpp
index e5822a0e9e..87378f86e0 100644
--- a/Source/Core/InputCommon/ControllerEmu.cpp
+++ b/Source/Core/InputCommon/ControllerEmu.cpp
@@ -137,18 +137,14 @@ void ControllerEmu::SaveConfig(IniFile::Section *sec, const std::string& base)
 		ctrlGroup->SaveConfig(sec, defdev, base);
 }
 
-ControllerEmu::AnalogStick::AnalogStick(const char* const _name) : ControlGroup(_name, GROUP_TYPE_STICK)
+ControllerEmu::AnalogStick::AnalogStick(const char* const _name, ControlState default_radius)
+	: ControlGroup(_name, GROUP_TYPE_STICK)
 {
 	for (auto& named_direction : named_directions)
 		controls.emplace_back(new Input(named_direction));
 
 	controls.emplace_back(new Input(_trans("Modifier")));
-
-	// Default to 100 radius for everything but gcpad.
-	if (name == "Stick" || name == "Left Stick" || name == "Right Stick")
-		settings.emplace_back(new Setting(_trans("Radius"), 1.0f, 0, 100));
-	else
-		settings.emplace_back(new Setting(_trans("Radius"), 0.7f, 0, 100));
+	settings.emplace_back(new Setting(_trans("Radius"), default_radius, 0, 100));
 	settings.emplace_back(new Setting(_trans("Dead Zone"), 0, 0, 50));
 }