From 57163e457f892c0e2507914ea231d0aa3e922dc4 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 11 Feb 2013 18:13:52 -0800 Subject: [PATCH] Fixed C variable declarations --- src/joystick/SDL_gamecontroller.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/joystick/SDL_gamecontroller.c b/src/joystick/SDL_gamecontroller.c index 6cb360123..010bae8fb 100644 --- a/src/joystick/SDL_gamecontroller.c +++ b/src/joystick/SDL_gamecontroller.c @@ -129,9 +129,11 @@ int SDL_GameControllerEventWatcher(void *userdata, SDL_Event * event) { case SDL_JOYAXISMOTION: { + SDL_GameController *controllerlist; + if ( event->jaxis.axis >= k_nMaxReverseEntries ) break; - SDL_GameController *controllerlist = SDL_gamecontrollers; + controllerlist = SDL_gamecontrollers; while ( controllerlist ) { if ( controllerlist->joystick->instance_id == event->jaxis.which ) @@ -153,9 +155,11 @@ int SDL_GameControllerEventWatcher(void *userdata, SDL_Event * event) case SDL_JOYBUTTONDOWN: case SDL_JOYBUTTONUP: { + SDL_GameController *controllerlist; + if ( event->jbutton.button >= k_nMaxReverseEntries ) break; - SDL_GameController *controllerlist = SDL_gamecontrollers; + controllerlist = SDL_gamecontrollers; while ( controllerlist ) { if ( controllerlist->joystick->instance_id == event->jbutton.which ) @@ -176,9 +180,11 @@ int SDL_GameControllerEventWatcher(void *userdata, SDL_Event * event) break; case SDL_JOYHATMOTION: { + SDL_GameController *controllerlist; + if ( event->jhat.hat >= 4 ) break; - SDL_GameController *controllerlist = SDL_gamecontrollers; + controllerlist = SDL_gamecontrollers; while ( controllerlist ) { if ( controllerlist->joystick->instance_id == event->jhat.which )