OpenTTD: quick post-release bugfix

project/jni/application/openttd/AndroidAppSettings.cfg

@@ -7,10 +7,10 @@ AppName="OpenTTD"
 AppFullName=org.openttd.sdl
 
 # Application version code (integer)
-AppVersionCode=16048
+AppVersionCode=16049
 
 # Application user-visible version name (string)
-AppVersionName="1.6.0.48"
+AppVersionName="1.6.0.49"
 
 # 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.48"
 # 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.zip.xz|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/openttd-data-1.6.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^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-2.zip.xz|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/openttd-data-1.6.0-2.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

project/jni/application/openttd/build-pc.sh

@@ -13,5 +13,9 @@ export CXXFLAGS=-O0
 [ -e Makefile ] || ../src/configure --enable-debug || exit 1
 make -j8 VERBOSE=1 || exit 1
 cd bin
-#gdb -ex run --args \
-./openttd -d 2 -r 854x480 #  -g opntitle.sav
+
+if [ -z "$1" ]; then
+	./openttd -d 2 -r 854x480
+else
+	gdb -ex run --args ./openttd -d 2 -r 854x480  -g opntitle.sav
+fi

project/jni/application/openttd/pack-data.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-VER=1.6.0
+VER=1.6.0-2
 
 cd data
 rm -f ../AndroidData/openttd-data-*.zip.xz ../AndroidData/openttd-data-*.zip