ubergames/lilium-voyager
0
0
Fork 0
mirror of https://github.com/UberGames/lilium-voyager.git synced 2024-12-14 14:11:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix joystick w/o controller mapping not working with SDL update.

Browse source
This commit is contained in:
SmileTheory 2016-08-16 19:01:18 -07:00
parent fb65e1232f
commit c5c01e771a
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
code/sdl/sdl_input.c
View file

@ -439,6 +439,21 @@ static void IN_InitJoystick( void )
gamepad = NULL; gamepad = NULL;
memset(&stick_state, '\0', sizeof (stick_state)); memset(&stick_state, '\0', sizeof (stick_state));
// SDL 2.0.4 requires SDL_INIT_JOYSTICK to be initialized separately from
// SDL_INIT_GAMECONTROLLER for SDL_JoystickOpen() to work correctly,
// despite https://wiki.libsdl.org/SDL_Init (retrieved 2016-08-16)
// indicating SDL_INIT_JOYSTICK should be initialized automatically.
if (!SDL_WasInit(SDL_INIT_JOYSTICK))
{
Com_DPrintf("Calling SDL_Init(SDL_INIT_JOYSTICK)...\n");
if (SDL_Init(SDL_INIT_JOYSTICK) != 0)
{
Com_DPrintf("SDL_Init(SDL_INIT_JOYSTICK) failed: %s\n", SDL_GetError());
return;
}
Com_DPrintf("SDL_Init(SDL_INIT_JOYSTICK) passed.\n");
}
if (!SDL_WasInit(SDL_INIT_GAMECONTROLLER)) if (!SDL_WasInit(SDL_INIT_GAMECONTROLLER))
{ {
Com_DPrintf("Calling SDL_Init(SDL_INIT_GAMECONTROLLER)...\n"); Com_DPrintf("Calling SDL_Init(SDL_INIT_GAMECONTROLLER)...\n");
@ -477,7 +492,7 @@ static void IN_InitJoystick( void )
stick = SDL_JoystickOpen( in_joystickNo->integer ); stick = SDL_JoystickOpen( in_joystickNo->integer );
if (stick == NULL) { if (stick == NULL) {
Com_DPrintf( "No joystick opened.\n" ); Com_DPrintf( "No joystick opened: %s\n", SDL_GetError() );
return; return;
} }
@ -507,6 +522,9 @@ static void IN_ShutdownJoystick( void )
if ( !SDL_WasInit( SDL_INIT_GAMECONTROLLER ) ) if ( !SDL_WasInit( SDL_INIT_GAMECONTROLLER ) )
return; return;
if ( !SDL_WasInit( SDL_INIT_JOYSTICK ) )
return;
if (gamepad) if (gamepad)
{ {
SDL_GameControllerClose(gamepad); SDL_GameControllerClose(gamepad);
@ -520,6 +538,7 @@ static void IN_ShutdownJoystick( void )
} }
SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER); SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER);
SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
} }