Removed some redundant code.

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2015-02-21 21:54:13 -04:00
parent 33d20620b5
commit 5932c39c86
+1 -11
View File
@@ -122,17 +122,7 @@ bool Joystick::isConnected() const
const char *Joystick::getName() const
{
// Use the saved name if this Joystick isn't connected anymore.
if (!isConnected())
return name.c_str();
// Prefer the Joystick name for consistency.
const char *joyname = SDL_JoystickName(joyhandle);
if (!joyname && isGamepad())
joyname = SDL_GameControllerName(controller);
return joyname;
return name.c_str();
}
int Joystick::getAxisCount() const