Report 0 joysticks to SDL if neither accelerometer nor on-screen keyboard is used

2010-10-27 14:44:00 +03:00
parent b7380b12e9
commit 5c9f98c11a
2 changed files with 7 additions and 2 deletions
--- a/project/jni/sdl-1.3/src/video/android/SDL_androidinput.c
+++ b/project/jni/sdl-1.3/src/video/android/SDL_androidinput.c
@@ -661,7 +661,12 @@ void SDL_ANDROID_processAndroidTrackballDampening()

 int SDL_SYS_JoystickInit(void)
 {
-	SDL_numjoysticks = MAX_MULTITOUCH_POINTERS+1;
+	SDL_numjoysticks = 0;
+	if( SDL_ANDROID_isJoystickUsed )
+		SDL_numjoysticks = 1;
+	if( isMultitouchUsed )
+		SDL_numjoysticks = MAX_MULTITOUCH_POINTERS+1;
+
 	return(SDL_numjoysticks);
 }