1 files changed, 24 insertions, 26 deletions

diff --git a/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp b/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
index 8e190060e95..53d3be35f92 100644
--- a/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
+++ b/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
@@ -35,44 +35,37 @@
 #ifndef DISABLE_SDL
 void SCA_Joystick::OnAxisMotion(SDL_Event* sdl_event)
 {
-	pFillAxes();
-	m_axisnum	= sdl_event->jaxis.axis;
-	m_axisvalue = sdl_event->jaxis.value;
+	if(sdl_event->jaxis.axis >= JOYAXIS_MAX)
+		return;
+	
+	m_axis_array[sdl_event->jaxis.axis]= sdl_event->jaxis.value;
 	m_istrig_axis = 1;
 }
 
-
+/* See notes below in the event loop */
 void SCA_Joystick::OnHatMotion(SDL_Event* sdl_event)
 {
-	m_hatdir = sdl_event->jhat.value;
-	m_hatnum = sdl_event->jhat.hat;
+	if(sdl_event->jhat.hat >= JOYHAT_MAX)
+		return;
+
+	m_hat_array[sdl_event->jhat.hat]= sdl_event->jhat.value;
 	m_istrig_hat = 1;
 }
 
+/* See notes below in the event loop */
 void SCA_Joystick::OnButtonUp(SDL_Event* sdl_event)
 {
 	m_istrig_button = 1;
-	
-	/* this is needed for the "all events" option
-	 * so we know if there are no buttons pressed */
-	int i;
-	for (i=0; i<m_buttonmax; i++) {
-		if (SDL_JoystickGetButton(m_private->m_joystick, i)) {
-			m_buttonnum = i;
-			return;
-		}
-	}
-	m_buttonnum = -2;
 }
 
 
 void SCA_Joystick::OnButtonDown(SDL_Event* sdl_event)
 {
-	if(sdl_event->jbutton.button <= m_buttonmax) /* unsigned int so always above 0 */
-	{
-		m_istrig_button = 1;
-		m_buttonnum = sdl_event->jbutton.button;
-	}
+	//if(sdl_event->jbutton.button > m_buttonmax) /* unsigned int so always above 0 */
+	//	return;
+	// sdl_event->jbutton.button;
+	
+	m_istrig_button = 1;
 }
 
 
@@ -81,22 +74,27 @@ void SCA_Joystick::OnNothing(SDL_Event* sdl_event)
 	m_istrig_axis = m_istrig_button = m_istrig_hat = 0;
 }
 
-/* only handle events for 1 joystick */
-
 void SCA_Joystick::HandleEvents(void)
 {
 	SDL_Event		sdl_event;
 	
 	int i;
-	for (i=0; i<JOYINDEX_MAX; i++) {
+	for (i=0; i<m_joynum; i++) { /* could use JOYINDEX_MAX but no reason to */
 		if(SCA_Joystick::m_instance[i])
 			SCA_Joystick::m_instance[i]->OnNothing(&sdl_event);
 	}
 	
-	if(SDL_PollEvent(&sdl_event))
+	while(SDL_PollEvent(&sdl_event))
 	{
 		/* Note! m_instance[sdl_event.jaxis.which]
 		 * will segfault if over JOYINDEX_MAX, not too nice but what are the chances? */
+		
+		/* Note!, with buttons, this wont care which button is pressed,
+		 * only to set 'm_istrig_button', actual pressed buttons are detected by SDL_JoystickGetButton */
+		
+		/* Note!, if you manage to press and release a button within 1 logic tick
+		 * it wont work as it should */
+		
 		switch(sdl_event.type)
 		{
 		case SDL_JOYAXISMOTION: