diff --git a/project/jni/application/openarena/AndroidAppSettings.cfg b/project/jni/application/openarena/AndroidAppSettings.cfg index f40854e10..0fe687d67 100644 --- a/project/jni/application/openarena/AndroidAppSettings.cfg +++ b/project/jni/application/openarena/AndroidAppSettings.cfg @@ -28,7 +28,7 @@ AppUsesJoystick=y AppUsesAccelerometer=n AppUsesMultitouch=y NonBlockingSwapBuffers=n -RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP SPACE ESCAPE" +RedefinedKeys="SPACE SPACE NO_REMAP NO_REMAP RETURN ESCAPE LCTRL" AppTouchscreenKeyboardKeysAmount=5 AppTouchscreenKeyboardKeysAmountAutoFire=0 RedefinedKeysScreenKb="SLASH BACKSPACE TAB END LCTRL SPACE UNKNOWN UNKNOWN UNKNOWN UNKNOWN" diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine index f1500fcde..172b75045 160000 --- a/project/jni/application/openarena/engine +++ b/project/jni/application/openarena/engine @@ -1 +1 @@ -Subproject commit f1500fcdeb25f71aab1134a06bbfd8b6525ba5f7 +Subproject commit 172b7504554c14e1fa8c6f21230e2393fd3abfc6 diff --git a/project/jni/sdl-1.2/src/video/android/keymap.c b/project/jni/sdl-1.2/src/video/android/keymap.c index c9103d0f7..b21bf9d42 100644 --- a/project/jni/sdl-1.2/src/video/android/keymap.c +++ b/project/jni/sdl-1.2/src/video/android/keymap.c @@ -138,10 +138,10 @@ void SDL_android_init_keymap(SDLKey *SDL_android_keymap) keymap[KEYCODE_BUTTON_Z] = SDL_KEY(Z); keymap[KEYCODE_BUTTON_L1] = SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_5)); keymap[KEYCODE_BUTTON_R1] = SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_SCREENKB_KEYCODE_4)); - keymap[KEYCODE_BUTTON_L2] = SDL_KEY(LCTRL); - keymap[KEYCODE_BUTTON_R2] = SDL_KEY(RCTRL); - keymap[KEYCODE_BUTTON_THUMBL] = SDL_KEY(LALT); - keymap[KEYCODE_BUTTON_THUMBR] = SDL_KEY(RALT); + keymap[KEYCODE_BUTTON_L2] = SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_KEYCODE_0)); + keymap[KEYCODE_BUTTON_R2] = SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_KEYCODE_6)); + keymap[KEYCODE_BUTTON_THUMBL] = SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_KEYCODE_1)); + keymap[KEYCODE_BUTTON_THUMBR] = SDL_KEY(SDL_KEY_VAL(SDL_ANDROID_KEYCODE_4)); keymap[KEYCODE_BUTTON_START] = SDL_KEY(RETURN); keymap[KEYCODE_BUTTON_SELECT] = SDL_KEY(ESCAPE); keymap[KEYCODE_BUTTON_MODE] = SDL_KEY(SPACE);