diff --git a/project/jni/application/openttd-lowmem/AndroidAppSettings.cfg b/project/jni/application/openttd-lowmem/AndroidAppSettings.cfg index ab7289185..e56046150 100644 --- a/project/jni/application/openttd-lowmem/AndroidAppSettings.cfg +++ b/project/jni/application/openttd-lowmem/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="OpenTTD lowmem" AppFullName=org.openttd.sdl.lowmem # Application version code (integer) -AppVersionCode=14029 +AppVersionCode=14130 # Application user-visible version name (string) -AppVersionName="1.4.0.29" +AppVersionName="1.4.1.30" # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...' # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu @@ -18,13 +18,13 @@ AppVersionName="1.4.0.29" # If the URL does not contain 'http://' it is treated as file from 'project/jni/application/src/AndroidData' dir - # these files are put inside .apk package by build system # Also please avoid 'https://' URLs, many Android devices do not have trust certificates and will fail to connect to SF.net over HTTPS -AppDataDownloadUrl="!!Data files - 20 Mb|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/openttd-data-1.4.0-1.zip/download^!!Config file|:.openttd/openttd.cfg:openttd-1.4.0.27.cfg" +AppDataDownloadUrl="!!Data files - 20 Mb|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/openttd-data-1.4.1.zip/download^!!Config file|:.openttd/openttd.cfg:openttd-1.4.0.30.cfg" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=y # Delete application data files when upgrading (specify file/dir paths separated by spaces) -DeleteFilesOnUpgrade="baseset .openttd/windows.cfg .openttd/hotkeys.cfg .openttd/openttd.cfg" +DeleteFilesOnUpgrade="" # Here you may type readme text, which will be shown during startup. Format is: # Text in English, use \\\\n to separate lines (that's four backslashes)^de:Text in Deutsch^ru:Text in Russian^button:Button that will open some URL:http://url-to-open/ diff --git a/project/jni/application/openttd-lowmem/AndroidData/openttd-1.4.0.27.cfg b/project/jni/application/openttd-lowmem/AndroidData/openttd-1.4.0.30.cfg similarity index 89% rename from project/jni/application/openttd-lowmem/AndroidData/openttd-1.4.0.27.cfg rename to project/jni/application/openttd-lowmem/AndroidData/openttd-1.4.0.30.cfg index 6b86c64e3..766618ef4 100644 --- a/project/jni/application/openttd-lowmem/AndroidData/openttd-1.4.0.27.cfg +++ b/project/jni/application/openttd-lowmem/AndroidData/openttd-1.4.0.30.cfg @@ -19,5 +19,5 @@ min_step_size = 40 [gui] left_mouse_btn_scrolling = true osk_activation = disabled -auto_scrolling = 2 - +auto_scrolling = 0 +reverse_scroll = true diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index 84ae17742..15989d0ce 100644 --- a/project/jni/application/openttd/AndroidAppSettings.cfg +++ b/project/jni/application/openttd/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="OpenTTD" AppFullName=org.openttd.sdl # Application version code (integer) -AppVersionCode=14130 +AppVersionCode=14131 # Application user-visible version name (string) -AppVersionName="1.4.1.30" +AppVersionName="1.4.1.31" # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...' # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src index 51575da52..9bbe39348 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit 51575da5254db38485c613c0922fbfa2c9ff319e +Subproject commit 9bbe393482d3b7b7a055021b7d892da400861807 diff --git a/project/jni/application/xrick/AndroidAppSettings.cfg b/project/jni/application/xrick/AndroidAppSettings.cfg index 8731f5435..e97d544fb 100644 --- a/project/jni/application/xrick/AndroidAppSettings.cfg +++ b/project/jni/application/xrick/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="XRick" AppFullName=net.xrick.sdl # Application version code (integer) -AppVersionCode=102121205 +AppVersionCode=102121206 # Application user-visible version name (string) -AppVersionName="021212.05" +AppVersionName="021212.06" # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...' # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu @@ -21,14 +21,14 @@ AppVersionName="021212.05" AppDataDownloadUrl="!Data size is 1 Mb|:data.zip:data.zip" # Reset SDL config when updating application to the new version (y) / (n) -ResetSdlConfigForThisVersion=y +ResetSdlConfigForThisVersion=n # Delete application data files when upgrading (specify file/dir paths separated by spaces) -DeleteFilesOnUpgrade="libsdl-DownloadFinished-0.flag" +DeleteFilesOnUpgrade="" # Here you may type readme text, which will be shown during startup. Format is: # Text in English, use \\\\n to separate lines (that's four backslashes)^de:Text in Deutsch^ru:Text in Russian^button:Button that will open some URL:http://url-to-open/ -ReadmeText='^You may press "Home" now - the data will be downloaded in background' +ReadmeText='' # libSDL version to use (1.2/1.3/2.0) LibSdlVersion=1.2 diff --git a/project/jni/application/xrick/xrick-021212/include/game.h b/project/jni/application/xrick/xrick-021212/include/game.h index 6bc48b78a..ea8c139ed 100644 --- a/project/jni/application/xrick/xrick-021212/include/game.h +++ b/project/jni/application/xrick/xrick-021212/include/game.h @@ -28,7 +28,7 @@ #define TRUE 1 #define FALSE 0 -#define GAME_PERIOD 50 +#define GAME_PERIOD 80 #define GAME_BOMBS_INIT 6 #define GAME_BULLETS_INIT 6 diff --git a/project/jni/application/xrick/xrick-021212/src/e_rick.c b/project/jni/application/xrick/xrick-021212/src/e_rick.c index 74e8b94af..72c469c45 100644 --- a/project/jni/application/xrick/xrick-021212/src/e_rick.c +++ b/project/jni/application/xrick/xrick-021212/src/e_rick.c @@ -193,7 +193,7 @@ e_rick_action2(void) return; } /* fall */ - offsy += 0x0080; + offsy += (offsy > 0) ? 0x0040 : 0x0080; if (offsy > 0x0800) { offsy = 0x0800; ylow = 0;