From 83cb2ccd2c61345a9591130b6f78b07dddd92aa2 Mon Sep 17 00:00:00 2001 From: pelya Date: Fri, 31 Dec 2010 10:36:34 +0000 Subject: [PATCH] Fixed swapped joystick in UQM --- project/jni/application/sc2/AndroidAppSettings.cfg | 7 ++++--- project/jni/application/sc2/src/uqm/gameinp.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/project/jni/application/sc2/AndroidAppSettings.cfg b/project/jni/application/sc2/AndroidAppSettings.cfg index f3b778c6b..7aac48a7a 100644 --- a/project/jni/application/sc2/AndroidAppSettings.cfg +++ b/project/jni/application/sc2/AndroidAppSettings.cfg @@ -1,5 +1,5 @@ # The application settings for Android libSDL port -AppSettingVersion=15 +AppSettingVersion=16 LibSdlVersion=1.2 AppName="Ur-Quan Masters" AppFullName=com.sourceforge.sc2 @@ -20,9 +20,10 @@ NonBlockingSwapBuffers=n RedefinedKeys="RETURN RSHIFT KP_PLUS KP_MINUS RCTRL F10" AppTouchscreenKeyboardKeysAmount=2 AppTouchscreenKeyboardKeysAmountAutoFire=0 +RedefinedKeysScreenKb="RETURN RSHIFT KP_PLUS KP_MINUS RCTRL F10" MultiABI=n -AppVersionCode=06919 -AppVersionName="0.6.9.19" +AppVersionCode=06920 +AppVersionName="0.6.9.20" CompiledLibraries="sdl_image tremor ogg" CustomBuildScript=n AppCflags='-O3 -DTHREADLIB_SDL=1 -DTIMELIB=SDL -DOVCODEC_TREMOR=1 -DNETPLAY=1 -DHAVE_REGEX=1 -DHAVE_GETOPT_LONG=1 -DHAVE_ZIP=1 -DHAVE_JOYSTICK=1' diff --git a/project/jni/application/sc2/src/uqm/gameinp.c b/project/jni/application/sc2/src/uqm/gameinp.c index 9ecd3ef3a..fe3ce51c9 100644 --- a/project/jni/application/sc2/src/uqm/gameinp.c +++ b/project/jni/application/sc2/src/uqm/gameinp.c @@ -568,7 +568,7 @@ BATTLE_INPUT_STATE GetDirectionalJoystickInput(int direction) angle -= atan2i_PI * 2; angle = angle * SHIP_DIRECTIONS / atan2i_PI / 2; - diff = angle - direction + SHIP_DIRECTIONS / 4; + diff = angle - direction - SHIP_DIRECTIONS / 4; while( diff >= SHIP_DIRECTIONS ) diff -= SHIP_DIRECTIONS; while( diff < 0 )