diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-09-08 22:46:58 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-09-08 22:46:58 -0500 |
| commit | d9ddc0d9ade926fcfc5e770a8448d2764e6dd506 (patch) | |
| tree | b77cd79f560aca23230560037d743e30480501e5 /Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp | |
| parent | af732dea392faeefbf84bb9c6f8220689d6b72f2 (diff) | |
| parent | c2578d066828145a7abb67c46d912ebdc68ef9d9 (diff) | |
Merge pull request #1042 from lioncash/unnecessary
InputCommon: Remove unnecessary breaks in XInput's GetName function
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp index b58c1c81a5..37949e03ac 100644 --- a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp +++ b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp @@ -177,14 +177,22 @@ std::string Device::GetName() const { switch (m_subtype) { - case XINPUT_DEVSUBTYPE_GAMEPAD: return "Gamepad"; break; - case XINPUT_DEVSUBTYPE_WHEEL: return "Wheel"; break; - case XINPUT_DEVSUBTYPE_ARCADE_STICK: return "Arcade Stick"; break; - case XINPUT_DEVSUBTYPE_FLIGHT_STICK: return "Flight Stick"; break; - case XINPUT_DEVSUBTYPE_DANCE_PAD: return "Dance Pad"; break; - case XINPUT_DEVSUBTYPE_GUITAR: return "Guitar"; break; - case XINPUT_DEVSUBTYPE_DRUM_KIT: return "Drum Kit"; break; - default: return "Device"; break; + case XINPUT_DEVSUBTYPE_GAMEPAD: + return "Gamepad"; + case XINPUT_DEVSUBTYPE_WHEEL: + return "Wheel"; + case XINPUT_DEVSUBTYPE_ARCADE_STICK: + return "Arcade Stick"; + case XINPUT_DEVSUBTYPE_FLIGHT_STICK: + return "Flight Stick"; + case XINPUT_DEVSUBTYPE_DANCE_PAD: + return "Dance Pad"; + case XINPUT_DEVSUBTYPE_GUITAR: + return "Guitar"; + case XINPUT_DEVSUBTYPE_DRUM_KIT: + return "Drum Kit"; + default: + return "Device"; } } |
