diff --git a/ChangeAppSettings.sh b/ChangeAppSettings.sh index 515fd3d72..647921d1d 100755 --- a/ChangeAppSettings.sh +++ b/ChangeAppSettings.sh @@ -280,8 +280,8 @@ fi if [ -z "$AppUsesMultitouch" -o -z "$AUTO" ]; then echo -echo "Application uses multitouch (y) or (n), multitouch events are passed as 4-axis joysticks 1-16, with pressure and size," -echo -n "or additionally as SDL_FINGERDOWN/UP/MOTION events in SDL 1.3, with SDL pressure = Android pressure * Andorid touchspot size ($AppUsesMultitouch): " +echo "Application uses multitouch (y) or (n), multitouch events are passed as SDL_JOYBUTTONDOWN/SDL_JOYBALLMOTION events" +echo -n " for the first joystick, or additionally as SDL_FINGERDOWN/UP/MOTION events in SDL 1.3 ($AppUsesMultitouch): " read var if [ -n "$var" ] ; then AppUsesMultitouch="$var" diff --git a/project/jni/sdl-1.3/src/video/android/SDL_androidinput.c b/project/jni/sdl-1.3/src/video/android/SDL_androidinput.c index 1d7ed3916..150df638e 100644 --- a/project/jni/sdl-1.3/src/video/android/SDL_androidinput.c +++ b/project/jni/sdl-1.3/src/video/android/SDL_androidinput.c @@ -432,9 +432,9 @@ JAVA_EXPORT_NAME(DemoGLSurfaceView_nativeMouse) ( JNIEnv* env, jobject thiz, j #if SDL_VERSION_ATLEAST(1,3,0) // Use nifty SDL 1.3 multitouch API if( action == MOUSE_MOVE ) - SDL_ANDROID_MainThreadPushMultitouchMotion(pointerId, x, y, force*radius / 16); + SDL_ANDROID_MainThreadPushMultitouchMotion(pointerId, x, y, force + radius); else - SDL_ANDROID_MainThreadPushMultitouchButton(pointerId, action == MOUSE_DOWN ? 1 : 0, x, y, force*radius / 16); + SDL_ANDROID_MainThreadPushMultitouchButton(pointerId, action == MOUSE_DOWN ? 1 : 0, x, y, force + radius); #endif // The old, bad, deprecated, but still used multitouch API