miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
pelya
2010-10-27 14:44:00 +03:00
parent b7380b12e9
commit 5c9f98c11a
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/java/Settings.java
View File

@@ -456,7 +456,7 @@ class Settings
nativeSetTrackballUsed(); nativeSetTrackballUsed();
if( Globals.AppUsesMouse ) if( Globals.AppUsesMouse )
nativeSetMouseUsed(); nativeSetMouseUsed();
if( Globals.AppUsesJoystick ) if( Globals.AppUsesJoystick && (Globals.UseAccelerometerAsArrowKeys || Globals.UseTouchscreenKeyboard) )
nativeSetJoystickUsed(); nativeSetJoystickUsed();
if( Globals.AppUsesMultitouch ) if( Globals.AppUsesMultitouch )
nativeSetMultitouchUsed(); nativeSetMultitouchUsed();

7
project/jni/sdl-1.3/src/video/android/SDL_androidinput.c
View File

@@ -661,7 +661,12 @@ void SDL_ANDROID_processAndroidTrackballDampening()
int SDL_SYS_JoystickInit(void) 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); return(SDL_numjoysticks);
} }