diff --git a/project/jni/application/fheroes2/AndroidAppSettings.cfg b/project/jni/application/fheroes2/AndroidAppSettings.cfg index 595f12aa9..11e1f5326 100644 --- a/project/jni/application/fheroes2/AndroidAppSettings.cfg +++ b/project/jni/application/fheroes2/AndroidAppSettings.cfg @@ -25,8 +25,8 @@ RedefinedKeysScreenKb="LCTRL M T H E C SPACE C S L" StartupMenuButtonTimeout=3000 HiddenMenuOptions='KeyboardConfigMainMenu ScreenKeyboardThemeConfig ScreenKeyboardTransparencyConfig' MultiABI=n -AppVersionCode=238315 -AppVersionName="2383.15" +AppVersionCode=238815 +AppVersionName="2388.15" CompiledLibraries="sdl_net sdl_mixer sdl_image sdl_ttf png intl" CustomBuildScript=n AppCflags='-finline-functions -O2 -DWITH_ZLIB -DWITH_MIXER -DWITH_XML -DWITH_IMAGE -DWITH_TTF -DWITH_AI=simple -DWITH_NET' 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 c5c32c0d7..7bc62e267 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 @@ -449,7 +449,8 @@ JAVA_EXPORT_NAME(DemoGLSurfaceView_nativeMouse) ( JNIEnv* env, jobject thiz, j } if( action == MOUSE_UP ) { - SDL_ANDROID_MainThreadPushMouseButton( SDL_RELEASED, SDL_BUTTON_RIGHT ); + if( rightClickMethod != RIGHT_CLICK_WITH_KEY ) + SDL_ANDROID_MainThreadPushMouseButton( SDL_RELEASED, SDL_BUTTON_RIGHT ); if( mouseInitialX >= 0 && mouseInitialY >= 0 && ( leftClickMethod == LEFT_CLICK_WITH_TAP || leftClickMethod == LEFT_CLICK_WITH_TAP_OR_TIMEOUT ) && @@ -513,11 +514,11 @@ JAVA_EXPORT_NAME(DemoGLSurfaceView_nativeMouse) ( JNIEnv* env, jobject thiz, j { if( moveMouseWithKbX >= 0 ) { - if( abs(moveMouseWithKbX - x) > SDL_ANDROID_sFakeWindowWidth / 10 ) + if( abs(moveMouseWithKbX - x) > SDL_ANDROID_sFakeWindowWidth / 5 ) moveMouseWithKbSpeedX += moveMouseWithKbX > x ? -1 : 1; else moveMouseWithKbSpeedX = moveMouseWithKbSpeedX * 2 / 3; - if( abs(moveMouseWithKbY - y) > SDL_ANDROID_sFakeWindowHeight / 10 ) + if( abs(moveMouseWithKbY - y) > SDL_ANDROID_sFakeWindowHeight / 5 ) moveMouseWithKbSpeedY += moveMouseWithKbY > y ? -1 : 1; else moveMouseWithKbSpeedY = moveMouseWithKbSpeedY * 2 / 3; @@ -525,8 +526,8 @@ JAVA_EXPORT_NAME(DemoGLSurfaceView_nativeMouse) ( JNIEnv* env, jobject thiz, j moveMouseWithKbX += moveMouseWithKbSpeedX; moveMouseWithKbY += moveMouseWithKbSpeedY; - if( abs(moveMouseWithKbX - x) > SDL_ANDROID_sFakeWindowWidth / 5 || - abs(moveMouseWithKbY - y) > SDL_ANDROID_sFakeWindowHeight / 5 ) + if( abs(moveMouseWithKbX - x) > SDL_ANDROID_sFakeWindowWidth / 4 || + abs(moveMouseWithKbY - y) > SDL_ANDROID_sFakeWindowHeight / 4 ) { moveMouseWithKbX = -1; moveMouseWithKbY = -1;