From 76ba20722a8dfde65f0d040c423924e0168c646c Mon Sep 17 00:00:00 2001 From: pelya Date: Tue, 14 Apr 2015 13:48:39 +0300 Subject: [PATCH] Updated OpenTTD --- project/jni/application/openttd/AndroidAppSettings.cfg | 2 +- 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, 4 insertions(+), 4 deletions(-) diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index 79d82612e..6068b352e 100644 --- a/project/jni/application/openttd/AndroidAppSettings.cfg +++ b/project/jni/application/openttd/AndroidAppSettings.cfg @@ -18,7 +18,7 @@ AppVersionName="1.5.0.37" # 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.5.0-RC1.zip.xz|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/openttd-data-1.5.0-RC1.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" +AppDataDownloadUrl="!!Data files - 20 Mb|openttd-data-1.5.0.zip.xz|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/openttd-data-1.5.0.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" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=n diff --git a/project/jni/application/openttd/build-pc.sh b/project/jni/application/openttd/build-pc.sh index b74b5bf74..9a7b8910e 100755 --- a/project/jni/application/openttd/build-pc.sh +++ b/project/jni/application/openttd/build-pc.sh @@ -14,4 +14,4 @@ export CXXFLAGS=-O0 make -j8 VERBOSE=1 || exit 1 cd bin #gdb -ex run --args ./openttd -./openttd -d 2 -r 854x480 # -g opntitle.sav +./openttd -d 2 -r 854x480 -g opntitle.sav diff --git a/project/jni/application/openttd/pack-data.sh b/project/jni/application/openttd/pack-data.sh index 7ca8ff365..c6c2b5a08 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.5.0-RC1 +VER=1.5.0 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 f4d77adc4..c03272c1a 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit f4d77adc4145325fd04ebf15cfd33e4bb2334faf +Subproject commit c03272c1ab1a685baf581aa8c966501d4f8299b3