diff options
| author | 2022-10-21 02:34:06 -0400 | |
|---|---|---|
| committer | 2022-10-22 15:02:04 -0400 | |
| commit | e6ab1f673b88b1af6bd966886249c7824ec5dbd4 (patch) | |
| tree | 045b57ae71c4b8efe34be8504d86638f13cf61ac /src/input_common/input_poller.cpp | |
| parent | CMakeLists: Remove all redundant warnings (diff) | |
| download | yuzu-e6ab1f673b88b1af6bd966886249c7824ec5dbd4.tar.gz yuzu-e6ab1f673b88b1af6bd966886249c7824ec5dbd4.tar.xz yuzu-e6ab1f673b88b1af6bd966886249c7824ec5dbd4.zip | |
general: Enforce C4800 everywhere except in video_core
Diffstat (limited to 'src/input_common/input_poller.cpp')
| -rw-r--r-- | src/input_common/input_poller.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/input_common/input_poller.cpp b/src/input_common/input_poller.cpp index ca33fb4eb..ccc3076ca 100644 --- a/src/input_common/input_poller.cpp +++ b/src/input_common/input_poller.cpp | |||
| @@ -797,8 +797,8 @@ std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateButtonDevice( | |||
| 797 | 797 | ||
| 798 | const auto button_id = params.Get("button", 0); | 798 | const auto button_id = params.Get("button", 0); |
| 799 | const auto keyboard_key = params.Get("code", 0); | 799 | const auto keyboard_key = params.Get("code", 0); |
| 800 | const auto toggle = params.Get("toggle", false); | 800 | const auto toggle = params.Get("toggle", false) != 0; |
| 801 | const auto inverted = params.Get("inverted", false); | 801 | const auto inverted = params.Get("inverted", false) != 0; |
| 802 | input_engine->PreSetController(identifier); | 802 | input_engine->PreSetController(identifier); |
| 803 | input_engine->PreSetButton(identifier, button_id); | 803 | input_engine->PreSetButton(identifier, button_id); |
| 804 | input_engine->PreSetButton(identifier, keyboard_key); | 804 | input_engine->PreSetButton(identifier, keyboard_key); |
| @@ -820,8 +820,8 @@ std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateHatButtonDevice( | |||
| 820 | 820 | ||
| 821 | const auto button_id = params.Get("hat", 0); | 821 | const auto button_id = params.Get("hat", 0); |
| 822 | const auto direction = input_engine->GetHatButtonId(params.Get("direction", "")); | 822 | const auto direction = input_engine->GetHatButtonId(params.Get("direction", "")); |
| 823 | const auto toggle = params.Get("toggle", false); | 823 | const auto toggle = params.Get("toggle", false) != 0; |
| 824 | const auto inverted = params.Get("inverted", false); | 824 | const auto inverted = params.Get("inverted", false) != 0; |
| 825 | 825 | ||
| 826 | input_engine->PreSetController(identifier); | 826 | input_engine->PreSetController(identifier); |
| 827 | input_engine->PreSetHatButton(identifier, button_id); | 827 | input_engine->PreSetHatButton(identifier, button_id); |
| @@ -879,7 +879,7 @@ std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateAnalogDevice( | |||
| 879 | .threshold = std::clamp(params.Get("threshold", 0.5f), 0.0f, 1.0f), | 879 | .threshold = std::clamp(params.Get("threshold", 0.5f), 0.0f, 1.0f), |
| 880 | .offset = std::clamp(params.Get("offset", 0.0f), -1.0f, 1.0f), | 880 | .offset = std::clamp(params.Get("offset", 0.0f), -1.0f, 1.0f), |
| 881 | .inverted = params.Get("invert", "+") == "-", | 881 | .inverted = params.Get("invert", "+") == "-", |
| 882 | .toggle = static_cast<bool>(params.Get("toggle", false)), | 882 | .toggle = params.Get("toggle", false) != 0, |
| 883 | }; | 883 | }; |
| 884 | input_engine->PreSetController(identifier); | 884 | input_engine->PreSetController(identifier); |
| 885 | input_engine->PreSetAxis(identifier, axis); | 885 | input_engine->PreSetAxis(identifier, axis); |
| @@ -895,8 +895,8 @@ std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateTriggerDevice( | |||
| 895 | }; | 895 | }; |
| 896 | 896 | ||
| 897 | const auto button = params.Get("button", 0); | 897 | const auto button = params.Get("button", 0); |
| 898 | const auto toggle = params.Get("toggle", false); | 898 | const auto toggle = params.Get("toggle", false) != 0; |
| 899 | const auto inverted = params.Get("inverted", false); | 899 | const auto inverted = params.Get("inverted", false) != 0; |
| 900 | 900 | ||
| 901 | const auto axis = params.Get("axis", 0); | 901 | const auto axis = params.Get("axis", 0); |
| 902 | const Common::Input::AnalogProperties properties = { | 902 | const Common::Input::AnalogProperties properties = { |
| @@ -926,8 +926,8 @@ std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateTouchDevice( | |||
| 926 | }; | 926 | }; |
| 927 | 927 | ||
| 928 | const auto button = params.Get("button", 0); | 928 | const auto button = params.Get("button", 0); |
| 929 | const auto toggle = params.Get("toggle", false); | 929 | const auto toggle = params.Get("toggle", false) != 0; |
| 930 | const auto inverted = params.Get("inverted", false); | 930 | const auto inverted = params.Get("inverted", false) != 0; |
| 931 | 931 | ||
| 932 | const auto axis_x = params.Get("axis_x", 0); | 932 | const auto axis_x = params.Get("axis_x", 0); |
| 933 | const Common::Input::AnalogProperties properties_x = { | 933 | const Common::Input::AnalogProperties properties_x = { |