ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8285 from lioncash/dinput-ffe 

InputCommon/DInputJoystick: Correct force-feedback flag testing
This commit is contained in:
JosJuice 2019-08-03 10:09:31 +02:00 committed by GitHub
parent 2770707587 37d643c7d3
commit 64c0ff576c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
View File

@ -164,9 +164,8 @@ Joystick::Joystick(/*const LPCDIDEVICEINSTANCE lpddi, */ const LPDIRECTINPUTDEVI
if (SUCCEEDED(m_device->EnumObjects(DIEnumDeviceObjectsCallback, (LPVOID)&objects, DIDFT_AXIS))) if (SUCCEEDED(m_device->EnumObjects(DIEnumDeviceObjectsCallback, (LPVOID)&objects, DIDFT_AXIS)))
{ {
const int num_ff_axes = const int num_ff_axes =
std::count_if(std::begin(objects), std::end(objects), [](DIDEVICEOBJECTINSTANCE& pdidoi) { std::count_if(std::begin(objects), std::end(objects),
return pdidoi.dwFlags && DIDOI_FFACTUATOR; [](const auto& pdidoi) { return (pdidoi.dwFlags & DIDOI_FFACTUATOR) != 0; });
});
InitForceFeedback(m_device, num_ff_axes); InitForceFeedback(m_device, num_ff_axes);
} }