From 07390a4c8dcde85602c1a91d3773061d67d169ab Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 22 Aug 2013 11:35:54 +0300 Subject: add some more fixes for SDL2 compilation. --- src/joystick.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/joystick.cpp') diff --git a/src/joystick.cpp b/src/joystick.cpp index 324de047d..244996937 100644 --- a/src/joystick.cpp +++ b/src/joystick.cpp @@ -26,6 +26,7 @@ #include "configuration.h" #include "inputmanager.h" #include "logger.h" +#include "sdlshared.h" #include "debug.h" @@ -65,7 +66,7 @@ void Joystick::init() joystickCount = SDL_NumJoysticks(); logger->log("%i joysticks/gamepads found", joystickCount); for (int i = 0; i < joystickCount; i++) - logger->log("- %s", SDL_JoystickName(i)); + logger->log("- %s", SDL_JoystickNameForIndex(i)); mEnabled = config.getBoolValue("joystickEnabled"); @@ -268,7 +269,7 @@ void Joystick::getNames(std::vector &names) { names.clear(); for (int i = 0; i < joystickCount; i++) - names.push_back(SDL_JoystickName(i)); + names.push_back(SDL_JoystickNameForIndex(i)); } void Joystick::update() -- cgit v1.2.3-60-g2f50