diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-02-17 08:55:19 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-02-17 08:55:19 +0100 |
| commit | 73691a8587e5f09ef138384d2ff97e4059ba9380 (patch) | |
| tree | 1b5509192851cdd3e6c09251c0051b33d8d3ca15 /Source/Core/InputCommon/ControllerInterface/DInput | |
| parent | a8ca2c6cc2ed6177bd26b6c022b919179a8ce37a (diff) | |
| parent | 3fd87a7636ff434118a5d7f7334550be8db55c0b (diff) | |
Merge pull request #86 from lioncash/vertical-alignments2-electric-boogaloo
Second and final pass of clearing out tabs.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/DInput')
3 files changed, 4 insertions, 10 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp index 7f107812ec..b9f483da4d 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp @@ -17,12 +17,6 @@ namespace ciface namespace DInput { -//BOOL CALLBACK DIEnumEffectsCallback(LPCDIEFFECTINFO pdei, LPVOID pvRef) -//{ -// ((std::list<DIEFFECTINFO>*)pvRef)->push_back(*pdei); -// return DIENUM_CONTINUE; -//} - BOOL CALLBACK DIEnumDeviceObjectsCallback(LPCDIDEVICEOBJECTINSTANCE lpddoi, LPVOID pvRef) { ((std::list<DIDEVICEOBJECTINSTANCE>*)pvRef)->push_back(*lpddoi); diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp index 8b11bb181f..07e439e4eb 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp @@ -17,7 +17,7 @@ namespace ciface namespace DInput { -#define DATA_BUFFER_SIZE 32 +#define DATA_BUFFER_SIZE 32 //----------------------------------------------------------------------------- // Modified some MSDN code to get all the XInput device GUID.Data1 values in a vector, @@ -130,7 +130,7 @@ void InitJoystick(IDirectInput8* const idi8, std::vector<Core::Device*>& devices // this is used to number the joysticks // multiple joysticks with the same name shall get unique ids starting at 0 - std::map< std::basic_string<TCHAR>, int> name_counts; + std::map< std::basic_string<TCHAR>, int> name_counts; std::vector<DWORD> xinput_guids; GetXInputGUIDS( xinput_guids ); diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp index c79f4e3365..4b17574d7b 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp @@ -218,12 +218,12 @@ bool KeyboardMouse::UpdateOutput() { bool want_on = false; if (m_state_out[i]) - want_on = m_state_out[i] > GetTickCount() % 255 ; // light should flash when output is 0.5 + want_on = m_state_out[i] > GetTickCount() % 255 ; // light should flash when output is 0.5 // lights are set to their original state when output is zero if (want_on ^ m_current_state_out[i]) { - kbinputs.push_back(KInput(named_lights[i].code)); // press + kbinputs.push_back(KInput(named_lights[i].code)); // press kbinputs.push_back(KInput(named_lights[i].code, true)); // release m_current_state_out[i] ^= 1; |