diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2010-07-10 06:48:24 +0000 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2010-07-10 06:48:24 +0000 |
| commit | a0aa506453195d99d8b7e1c0297bb1e285428d0c (patch) | |
| tree | 21a19ab26075bb5bbcb5a630fc6fc87e9a162265 /Source/Core/InputCommon/Src/ControllerInterface/DInput/DInput.cpp | |
| parent | 2bcdf4f5a476decb416a4947acc5472f9c011223 (diff) | |
GCPad/Wiimote New: Added a set defaults button to the config dialog. (gave new wiimote plugin a few default buttons, not done) Moved MSWindows cursor position code to ControllerInterface/DInput (plan on moving Linux's cursor code to Xlib as well). IR Up,Down,L,R now must have Cursor X/Y/-+ mapped for regular mouse control on Windows. (hopefully this isn't too confusing, the reset to default button automatically sets this up). Renamed One,Two,Minus,Plus to 12-+ (you will have to reconfigure these buttons, sorry). Added text labels for the button and trigger preview bitmaps. -other minor stuff.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5865 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/DInput/DInput.cpp')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/DInput/DInput.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInput.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInput.cpp index a9098d6288..806fd31f3d 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInput.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInput.cpp @@ -61,14 +61,14 @@ std::string GetDeviceName(const LPDIRECTINPUTDEVICE8 device) return StripSpaces(out); } -void Init( std::vector<ControllerInterface::Device*>& devices/*, HWND hwnd*/ ) +void Init(std::vector<ControllerInterface::Device*>& devices, HWND hwnd) { IDirectInput8* idi8; if (FAILED(DirectInput8Create(GetModuleHandle(NULL), DIRECTINPUT_VERSION, IID_IDirectInput8, (LPVOID*)&idi8, NULL))) return; #ifdef CIFACE_USE_DINPUT_KBM - InitKeyboardMouse(idi8, devices); + InitKeyboardMouse(idi8, devices, hwnd); #endif #ifdef CIFACE_USE_DINPUT_JOYSTICK InitJoystick(idi8, devices/*, hwnd*/); |