diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-11-13 00:56:32 -0800 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-11-28 10:50:45 -0800 |
| commit | 61fcfc4bf2058d971af6882af2765ad34d935fcb (patch) | |
| tree | 366336fe89d763029978dbbe642b626ffb775237 /Source/Core/InputCommon/ControllerInterface/DInput | |
| parent | 367a42dcfdf61e5fcd3e3444190ed25d4d8fc114 (diff) | |
ControllerInterface: Remove unused ClearInputState
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/DInput')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp | 11 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h | 2 |
2 files changed, 3 insertions, 10 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp index ecd5db838c..0c1ed5aa18 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp @@ -149,7 +149,9 @@ Joystick::Joystick( /*const LPCDIDEVICEINSTANCE lpddi, */const LPDIRECTINPUTDEVI InitForceFeedback(m_device, (int)objects.size()); } - ClearInputState(); + ZeroMemory(&m_state_in, sizeof(m_state_in)); + // set hats to center + memset(m_state_in.rgdwPOV, 0xFF, sizeof(m_state_in.rgdwPOV)); } Joystick::~Joystick() @@ -158,13 +160,6 @@ Joystick::~Joystick() m_device->Release(); } -void Joystick::ClearInputState() -{ - ZeroMemory(&m_state_in, sizeof(m_state_in)); - // set hats to center - memset(m_state_in.rgdwPOV, 0xFF, sizeof(m_state_in.rgdwPOV)); -} - std::string Joystick::GetName() const { return GetDeviceName(m_device); diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h index 0ac535cdfe..17770afe5a 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h @@ -54,8 +54,6 @@ private: public: bool UpdateInput(); - void ClearInputState(); - Joystick(const LPDIRECTINPUTDEVICE8 device, const unsigned int index); ~Joystick(); |