From 222e626ff238e2cc095f9ab02fe3b822158868a4 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Tue, 11 May 2021 01:45:58 +0300 Subject: [PATCH] OpenTTD: another update --- project/jni/application/openttd/AndroidAppSettings.cfg | 8 ++++---- project/jni/application/openttd/build-pc.sh | 2 +- project/jni/application/openttd/pack-data.sh | 2 +- project/jni/application/openttd/src | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index 464d0244b..842b71089 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=1112104 +AppVersionCode=1112105 # Application user-visible version name (string) -AppVersionName="1.11.2.rev104" +AppVersionName="1.11.2.rev105" # 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, '!!' will also hide the entry from the menu, so it cannot be disabled @@ -20,7 +20,7 @@ AppVersionName="1.11.2.rev104" # You can specify Google Play expansion files in the form 'obb:main.12345' or 'obb:patch.12345' where 12345 is the app version for obb file # You can use .zip.xz archives for better compression, but you need to add 'lzma' to CompiledLibraries # Generate .zip.xz files like this: zip -0 -r data.zip your-data/* ; xz -8 data.zip -AppDataDownloadUrl="!!Data files|openttd-data-1.11.2-0.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-1.4.0.30.cfg^!!MIDI music support (18 Mb)|timidity.zip.xz|https://sourceforge.net/projects/libsdl-android/files/timidity.zip.xz^!!Internationalization files|icudt62l.zip.xz|https://sourceforge.net/projects/libsdl-android/files/icudt62l.zip.xz^!!Fonts|openttd-fonts.zip.xz|https://sourceforge.net/projects/libsdl-android/files/openttd-fonts.zip.xz" +AppDataDownloadUrl="!!Data files|openttd-data-1.11.2-1.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-1.4.0.30.cfg^!!MIDI music support (18 Mb)|timidity.zip.xz|https://sourceforge.net/projects/libsdl-android/files/timidity.zip.xz^!!Internationalization files|icudt62l.zip.xz|https://sourceforge.net/projects/libsdl-android/files/icudt62l.zip.xz^!!Fonts|openttd-fonts.zip.xz|https://sourceforge.net/projects/libsdl-android/files/openttd-fonts.zip.xz" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=y @@ -299,7 +299,7 @@ AppSubdirsBuild='' AppBuildExclude='' # Application command line parameters, including app name as 0-th param -AppCmdline='openttd -d 0 -b 32bpp-anim' +AppCmdline='openttd -d 0' # Screen size is used by Google Play to prevent an app to be installed on devices with smaller screens # Minimum screen size that application supports: (s)mall / (m)edium / (l)arge diff --git a/project/jni/application/openttd/build-pc.sh b/project/jni/application/openttd/build-pc.sh index e3e8b0d18..780150d1a 100755 --- a/project/jni/application/openttd/build-pc.sh +++ b/project/jni/application/openttd/build-pc.sh @@ -15,7 +15,7 @@ cd bin cp -f ../baseset/opntitle.dat opntitle.sav if [ -z "$1" ]; then - ../openttd -d 2 -m null -r 854x480 # -g opntitle.sav + ../openttd -d 0 -m null -r 854x480 -g opntitle.sav elif [ -n "$2" ]; then valgrind --track-fds=yes --log-file=../../valgrind.log --leak-check=full \ ../openttd -d 0 -m null # -g opntitle.sav diff --git a/project/jni/application/openttd/pack-data.sh b/project/jni/application/openttd/pack-data.sh index 85bf8ec59..fe2f94b6d 100755 --- a/project/jni/application/openttd/pack-data.sh +++ b/project/jni/application/openttd/pack-data.sh @@ -1,6 +1,6 @@ #!/bin/sh -VER=1.11.2-0 +VER=1.11.2-1 cd data rm -f ../AndroidData/openttd-data-*.zip.xz ../AndroidData/openttd-data-*.zip diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src index 3949f8746..bed585d1e 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit 3949f874650d3aa2f5184bfe2672054d25e5ed99 +Subproject commit bed585d1ea6bc0eb747d4e2813a17da8fca2d059