diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2010-09-18 16:43:43 +0000 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2010-09-18 16:43:43 +0000 |
| commit | eda652b7a07a8df57b5953a51c1eb96246778d64 (patch) | |
| tree | df8f6d2a5d8d5c618400a459338bc9cb1e9e49d3 /Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp | |
| parent | 7216699fc420e96f4420169932d5abbb975b687a (diff) | |
New Wiimote Plugin: Fix Emulated Wiimote Problem.(fixes issue 3230) Made the "Connected to X Wiimotes" text update on all tabs when clicking "Refresh"/"Pair Up". Some other cleanup.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6216 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp index f88e90b1cc..f2a4f5561c 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp @@ -435,6 +435,12 @@ bool Joystick::UpdateInput() bool Joystick::UpdateOutput() { size_t ok_count = 0; + + DIEFFECT eff; + ZeroMemory(&eff, sizeof(eff)); + eff.dwSize = sizeof(DIEFFECT); + eff.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS; + std::vector<EffectState>::iterator i = m_state_out.begin(), e = m_state_out.end(); @@ -444,10 +450,6 @@ bool Joystick::UpdateOutput() { if (i->size) { - DIEFFECT eff; - ZeroMemory(&eff, sizeof(eff)); - eff.dwSize = sizeof(DIEFFECT); - eff.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS; eff.cbTypeSpecificParams = i->size; eff.lpvTypeSpecificParams = i->params; // set params and start effect |