diff options
| author | JosJuice <josjuice@gmail.com> | 2019-08-03 10:09:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-03 10:09:31 +0200 |
| commit | 64c0ff576c6d3ea2ee35e6b6d7ea8c814442d53f (patch) | |
| tree | 4193d37b8761cc5389ba0cffc0dde4da7a550042 /Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp | |
| parent | 27707075876abe0f89bcb7d7549d3036a75a92af (diff) | |
| parent | 37d643c7d3055c40ebaca920f7efa34a6337379b (diff) | |
Merge pull request #8285 from lioncash/dinput-ffe
InputCommon/DInputJoystick: Correct force-feedback flag testing
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp index bba6b87ae6..ff27eedf44 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp @@ -164,9 +164,8 @@ Joystick::Joystick(/*const LPCDIDEVICEINSTANCE lpddi, */ const LPDIRECTINPUTDEVI if (SUCCEEDED(m_device->EnumObjects(DIEnumDeviceObjectsCallback, (LPVOID)&objects, DIDFT_AXIS))) { const int num_ff_axes = - std::count_if(std::begin(objects), std::end(objects), [](DIDEVICEOBJECTINSTANCE& pdidoi) { - return pdidoi.dwFlags && DIDOI_FFACTUATOR; - }); + std::count_if(std::begin(objects), std::end(objects), + [](const auto& pdidoi) { return (pdidoi.dwFlags & DIDOI_FFACTUATOR) != 0; }); InitForceFeedback(m_device, num_ff_axes); } |