[ioquake3] 17/59: Controller hot plug support.

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository ioquake3.

commit d09866861e816caed1710c5c4f7bc4197d52da92
Author: SmileTheory <smilethe...@gmail.com>
Date:   Thu Aug 4 21:32:35 2016 -0700

    Controller hot plug support.
---
 code/sdl/sdl_input.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/code/sdl/sdl_input.c b/code/sdl/sdl_input.c
index 90ad596..1af20ec 100644
--- a/code/sdl/sdl_input.c
+++ b/code/sdl/sdl_input.c
@@ -434,15 +434,15 @@ static void IN_InitJoystick( void )
        stick = NULL;
        memset(&stick_state, '\0', sizeof (stick_state));
 
-       if (!SDL_WasInit(SDL_INIT_JOYSTICK))
+       if (!SDL_WasInit(SDL_INIT_GAMECONTROLLER))
        {
-               Com_DPrintf("Calling SDL_Init(SDL_INIT_JOYSTICK)...\n");
-               if (SDL_Init(SDL_INIT_JOYSTICK) != 0)
+               Com_DPrintf("Calling SDL_Init(SDL_INIT_GAMECONTROLLER)...\n");
+               if (SDL_Init(SDL_INIT_GAMECONTROLLER) != 0)
                {
-                       Com_DPrintf("SDL_Init(SDL_INIT_JOYSTICK) failed: %s\n", 
SDL_GetError());
+                       Com_DPrintf("SDL_Init(SDL_INIT_GAMECONTROLLER) failed: 
%s\n", SDL_GetError());
                        return;
                }
-               Com_DPrintf("SDL_Init(SDL_INIT_JOYSTICK) passed.\n");
+               Com_DPrintf("SDL_Init(SDL_INIT_GAMECONTROLLER) passed.\n");
        }
 
        total = SDL_NumJoysticks();
@@ -459,7 +459,7 @@ static void IN_InitJoystick( void )
 
        if( !in_joystick->integer ) {
                Com_DPrintf( "Joystick is not active.\n" );
-               SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
+               SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER);
                return;
        }
 
@@ -494,7 +494,7 @@ IN_ShutdownJoystick
 */
 static void IN_ShutdownJoystick( void )
 {
-       if ( !SDL_WasInit( SDL_INIT_JOYSTICK ) )
+       if ( !SDL_WasInit( SDL_INIT_GAMECONTROLLER ) )
                return;
 
        if (stick)
@@ -503,7 +503,7 @@ static void IN_ShutdownJoystick( void )
                stick = NULL;
        }
 
-       SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
+       SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER);
 }
 
 /*
@@ -840,6 +840,11 @@ static void IN_ProcessEvents( void )
                                }
                                break;
 
+                       case SDL_CONTROLLERDEVICEADDED:
+                       case SDL_CONTROLLERDEVICEREMOVED:
+                               IN_InitJoystick();
+                               break;
+
                        case SDL_QUIT:
                                Cbuf_ExecuteText(EXEC_NOW, "quit Closed 
window\n");
                                break;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/ioquake3.git

_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits