summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerEmu.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2014-08-14 17:15:03 -0400
committerLioncash <mathew1800@gmail.com>2014-08-14 17:15:03 -0400
commit001c9a18fa6bdb8bc37a466f8665b4a147a816ca (patch)
tree7f5c0ea2e389540efa90ff4c583d3ae73c10628b /Source/Core/InputCommon/ControllerEmu.cpp
parent16a7e6dce5f8fa74587d2828638c395769ce1523 (diff)
parent35ae1b4ee27c926f6ed32a37699ef40ef614f335 (diff)
Merge pull request #782 from RachelBryk/radius
Set the default radius to 100 for non-gcpad analog sticks.
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu.cpp')
-rw-r--r--Source/Core/InputCommon/ControllerEmu.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu.cpp
index 6e2bf8aa73..e5822a0e9e 100644
--- a/Source/Core/InputCommon/ControllerEmu.cpp
+++ b/Source/Core/InputCommon/ControllerEmu.cpp
@@ -144,7 +144,11 @@ ControllerEmu::AnalogStick::AnalogStick(const char* const _name) : ControlGroup(
controls.emplace_back(new Input(_trans("Modifier")));
- settings.emplace_back(new Setting(_trans("Radius"), 0.7f, 0, 100));
+ // 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("Dead Zone"), 0, 0, 50));
}