TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

SDL2: SDL_JoystickName parameter changed

Browse source
This commit is contained in:
Kp 2015-07-14 02:42:12 +00:00
parent a2cb5fea6e
commit 19ed586988
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/arch/sdl/joy.cpp
View file

@ -159,7 +159,11 @@ void joy_init()
for (int i = 0; i < n; i++) {
auto &joystick = SDL_Joysticks[num_joysticks];
const auto handle = joystick.handle = SDL_JoystickOpen(i);
#if SDL_MAJOR_VERSION == 1
con_printf(CON_NORMAL, "sdl-joystick %d: %s", i, SDL_JoystickName(i));
#else
con_printf(CON_NORMAL, "sdl-joystick %d: %s", i, SDL_JoystickName(handle));
#endif
if (handle)
{
const auto n_axes = joystick.n_axes = check_warn_joy_support_limit<MAX_AXES_PER_JOYSTICK>(SDL_JoystickNumAxes(handle), "axe");