diff options
| author | Rachel Bryk <RachelBryk@gmail.com> | 2014-11-09 15:02:18 -0500 |
|---|---|---|
| committer | Rachel Bryk <RachelBryk@gmail.com> | 2014-11-11 14:14:22 -0500 |
| commit | e9cb629723bb0fabbad130c2a63b3cdbaaf8ba6a (patch) | |
| tree | e63ba5755800e9ab82a6314ba8e9f368cbd23a67 /Source/Core/InputCommon/ControllerEmu.cpp | |
| parent | 71d8165a8649cde73663b1534bbdd6094faecf2d (diff) | |
Fix some double->float conversions.
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu.cpp index f7de12c2e7..df82bc0970 100644 --- a/Source/Core/InputCommon/ControllerEmu.cpp +++ b/Source/Core/InputCommon/ControllerEmu.cpp @@ -155,12 +155,12 @@ ControllerEmu::AnalogStick::AnalogStick(const char* const _name, ControlState de ControllerEmu::Buttons::Buttons(const std::string& _name) : ControlGroup(_name, GROUP_TYPE_BUTTONS) { - settings.emplace_back(new Setting(_trans("Threshold"), 0.5f)); + settings.emplace_back(new Setting(_trans("Threshold"), 0.5)); } ControllerEmu::MixedTriggers::MixedTriggers(const std::string& _name) : ControlGroup(_name, GROUP_TYPE_MIXED_TRIGGERS) { - settings.emplace_back(new Setting(_trans("Threshold"), 0.9f)); + settings.emplace_back(new Setting(_trans("Threshold"), 0.9)); } ControllerEmu::Triggers::Triggers(const std::string& _name) : ControlGroup(_name, GROUP_TYPE_TRIGGERS) @@ -203,7 +203,7 @@ ControllerEmu::Tilt::Tilt(const std::string& _name) : ControlGroup(_name, GROUP_ settings.emplace_back(new Setting(_trans("Dead Zone"), 0, 0, 50)); settings.emplace_back(new Setting(_trans("Circle Stick"), 0)); - settings.emplace_back(new Setting(_trans("Angle"), 0.9f, 0, 180)); + settings.emplace_back(new Setting(_trans("Angle"), 0.9, 0, 180)); } ControllerEmu::Cursor::Cursor(const std::string& _name) @@ -216,9 +216,9 @@ ControllerEmu::Cursor::Cursor(const std::string& _name) controls.emplace_back(new Input("Backward")); controls.emplace_back(new Input(_trans("Hide"))); - settings.emplace_back(new Setting(_trans("Center"), 0.5f)); - settings.emplace_back(new Setting(_trans("Width"), 0.5f)); - settings.emplace_back(new Setting(_trans("Height"), 0.5f)); + settings.emplace_back(new Setting(_trans("Center"), 0.5)); + settings.emplace_back(new Setting(_trans("Width"), 0.5)); + settings.emplace_back(new Setting(_trans("Height"), 0.5)); } |