diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2016-07-14 23:13:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-14 23:13:30 +0200 |
| commit | a9d8a7decd510aecbc0492709ecd347e0f7b56de (patch) | |
| tree | 63cdec11183166eeb2bb5440537965b19dbe1593 /Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp | |
| parent | a97a546bd667438a98ec2d9c698ab7958280693d (diff) | |
| parent | 788e19f54d86ba45cdc83d39c0488b17aa1d00dd (diff) | |
Merge pull request #4009 from leoetlino/common-id-assign
ControllerInterface: Make the ID assigning code common
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp index 2ee0477653..384174a3f1 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp @@ -185,12 +185,6 @@ std::string KeyboardMouse::GetName() const return "Keyboard Mouse"; } -int KeyboardMouse::GetId() const -{ - // should this be -1, idk - return 0; -} - std::string KeyboardMouse::GetSource() const { return DINPUT_SOURCE_NAME; |