From d1e8985bda4c8f705062cc68ff2d2788d6a6ce88 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Tue, 12 Apr 2016 22:59:44 +0300 Subject: [PATCH] OpenTTD: yet more bugfixes --- project/jni/application/openttd/AndroidAppSettings.cfg | 6 +++--- 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, 6 insertions(+), 6 deletions(-) diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index 6aeed28b7..934ee3e05 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=16051 +AppVersionCode=16053 # Application user-visible version name (string) -AppVersionName="1.6.0.51" +AppVersionName="1.6.0.53" # 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,7 +18,7 @@ AppVersionName="1.6.0.51" # 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 # You can specify Google Play expansion files in the form 'obb:main.12345' or 'obb:patch.12345' where 12345 is the app version, first associated with the file -AppDataDownloadUrl="!!Data files - 20 Mb|openttd-data-1.6.0-3.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-1.4.0.30.cfg^!!MIDI music support (18 Mb)|timidity.zip.xz|http://sourceforge.net/projects/libsdl-android/files/timidity.zip.xz^!!Internationalization files|icudt52l.zip.xz|http://sourceforge.net/projects/libsdl-android/files/icudt52l.zip.xz^HD graphics - 220 Mb download|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/zBase-v5588.zip.xz/download" +AppDataDownloadUrl="!!Data files - 20 Mb|openttd-data-1.6.0-4.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-1.4.0.30.cfg^!!MIDI music support (18 Mb)|timidity.zip.xz|http://sourceforge.net/projects/libsdl-android/files/timidity.zip.xz^!!Internationalization files|icudt52l.zip.xz|http://sourceforge.net/projects/libsdl-android/files/icudt52l.zip.xz^HD graphics - 220 Mb download|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/zBase-v5588.zip.xz/download" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=y diff --git a/project/jni/application/openttd/build-pc.sh b/project/jni/application/openttd/build-pc.sh index 6557c77dc..6a481139e 100755 --- a/project/jni/application/openttd/build-pc.sh +++ b/project/jni/application/openttd/build-pc.sh @@ -19,6 +19,6 @@ export LD_LIBRARY_PATH=/usr/local/lib if [ -z "$1" ]; then ./openttd -d 2 -r 854x480 -b 32bpp-anim else - gdb -ex run --args \ + #gdb -ex run --args \ ./openttd -d 2 -r 854x480 -b 32bpp-anim -g opntitle.sav fi diff --git a/project/jni/application/openttd/pack-data.sh b/project/jni/application/openttd/pack-data.sh index 4bcbc91f7..c3dcf4c0a 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.6.0-3 +VER=1.6.0-4 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 0b931d938..05d1643d2 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit 0b931d9383f37f3f7591f7b0c491d6551a13dbd8 +Subproject commit 05d1643d26564e1fce9394f8dd385f8381614a47