diff options
| author | Matthew Parlane <parlane@gmail.com> | 2016-06-26 00:17:08 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-26 00:17:08 +1200 |
| commit | a7448271a9203aea26f05f62b75e43c5e5860e98 (patch) | |
| tree | 5e43d6ee5fcfbe74a6bacf1eba81ee0a7a44fa14 /Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp | |
| parent | 2f9a911c540473bb6cea5a9891a6a281aa2f3750 (diff) | |
| parent | 9b075556ea826699800d9478d1eed3a80368c348 (diff) | |
Merge pull request #3892 from leoetlino/ciface-synchronisation
ControllerInterface: Add synchronisation
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp index 09227b5932..83394852af 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "Common/StringUtil.h" - #include "InputCommon/ControllerInterface/DInput/DInput.h" +#include "Common/StringUtil.h" +#include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/ControllerInterface/DInput/DInputJoystick.h" #include "InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h" @@ -44,7 +44,7 @@ std::string GetDeviceName(const LPDIRECTINPUTDEVICE8 device) return result; } -void Init(std::vector<Core::Device*>& devices, HWND hwnd) +void Init(HWND hwnd) { IDirectInput8* idi8; if (FAILED(DirectInput8Create(GetModuleHandle(nullptr), DIRECTINPUT_VERSION, IID_IDirectInput8, @@ -53,8 +53,8 @@ void Init(std::vector<Core::Device*>& devices, HWND hwnd) return; } - InitKeyboardMouse(idi8, devices, hwnd); - InitJoystick(idi8, devices, hwnd); + InitKeyboardMouse(idi8, hwnd); + InitJoystick(idi8, hwnd); idi8->Release(); } |
