eden-emu/SDL
15
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-05-21 20:28:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed build

Browse source
This commit is contained in:
Sam Lantinga 2019-11-22 14:09:24 -08:00
parent 13006ba9e1
commit 733f25252a
8 changed files with 20 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/joystick/SDL_gamecontroller.c
View file

@ -1418,8 +1418,7 @@ SDL_GameControllerNameForIndex(int device_index)
SDL_GameControllerType
SDL_GameControllerTypeForIndex(int joystick_index)
{
SDL_JoystickGUID guid = SDL_JoystickGetDeviceGUID(joystick_index);
return SDL_GetGameControllerTypeFromGUID(guid);
return SDL_GetJoystickGameControllerTypeFromGUID(SDL_JoystickGetDeviceGUID(joystick_index), SDL_JoystickNameForIndex(joystick_index));
}
@ -1757,10 +1756,7 @@ SDL_GameControllerName(SDL_GameController * gamecontroller)
SDL_GameControllerType
SDL_GameControllerGetType(SDL_GameController *gamecontroller)
{
if (!gamecontroller) {
return SDL_CONTROLLER_TYPE_UNKNOWN;
}
return SDL_GetGameControllerTypeFromGUID(gamecontroller->joystick->guid);
return SDL_GetJoystickGameControllerTypeFromGUID(SDL_JoystickGetGUID(SDL_GameControllerGetJoystick(gamecontroller)), SDL_JoystickName(SDL_GameControllerGetJoystick(gamecontroller)));
}
int