diff --git a/.gitmodules b/.gitmodules index 97165710d..9be2ae2a0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -41,7 +41,7 @@ [submodule "project/jni/application/openttd/src"] path = project/jni/application/openttd/src url = https://github.com/pelya/openttd-android.git - branch = 1.9 + branch = 1.10 [submodule "project/jni/application/uae4all2"] path = project/jni/application/uae4all2 url = https://github.com/lubomyr/uae4all2.git diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index b722c0fef..549859c25 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=19384 +AppVersionCode=110084 # Application user-visible version name (string) -AppVersionName="1.9.3.84" +AppVersionName="1.10.0-RC1.84" # 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.9.3.84" # 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 - 20 Mb|openttd-data-1.9.3-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|icudt62l.zip.xz|http://sourceforge.net/projects/libsdl-android/files/icudt62l.zip.xz" +AppDataDownloadUrl="!!Data files - 20 Mb|openttd-data-1.10.0-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|icudt62l.zip.xz|http://sourceforge.net/projects/libsdl-android/files/icudt62l.zip.xz" # 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 04fa42cd6..d5a3c21b9 100755 --- a/project/jni/application/openttd/build-pc.sh +++ b/project/jni/application/openttd/build-pc.sh @@ -18,12 +18,12 @@ cd bin export LD_LIBRARY_PATH=/usr/local/lib if [ -z "$1" ]; then - ./openttd -d 0 -m null -g opntitle.sav + ./openttd -d 0 -m null -g opntitle.sav -r 854x480 elif [ -n "$2" ]; then valgrind --track-fds=yes --log-file=../../valgrind.log --leak-check=full \ ./openttd -d 0 -m null # -g opntitle.sav else #valgrind --track-fds=yes --log-file=valgrind.log --leak-check=full \ gdb -ex run --args \ - ./openttd -d 0 -m null -g opntitle.sav + ./openttd -d 0 -m null -g opntitle.sav -r 854x480 fi diff --git a/project/jni/application/openttd/pack-data.sh b/project/jni/application/openttd/pack-data.sh index 656634f19..c1bc251ff 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.9.3-0 +VER=1.10.0-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 a8a532871..8bb59f70a 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit a8a532871687ab332a68ebd35abd077b3bc4b5c5 +Subproject commit 8bb59f70a643539df472878b26c328aada4f37a6