From 7ea36b5ee698a13e3e04fd6fef73b1a8f4fa569a Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Sun, 16 Nov 2014 04:52:11 +0200
Subject: [PATCH] Updated OpenTTD

---
 project/jni/application/openttd/AndroidAppSettings.cfg | 6 +++---
 project/jni/application/openttd/build-pc.sh            | 8 ++++++--
 project/jni/application/openttd/src                    | 2 +-
 todo.txt                                               | 8 --------
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg
index 596d955c3..c46dee9de 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=14434
+AppVersionCode=14435
 
 # Application user-visible version name (string)
-AppVersionName="1.4.4.34"
+AppVersionName="1.4.4.35"
 
 # 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
@@ -213,7 +213,7 @@ FirstStartMenuOptions=''
 
 # Specify architectures to compile, 'all' or 'y' to compile for all architectures.
 # Available architectures: armeabi armeabi-v7a armeabi-v7a-hard x86 mips
-MultiABI='armeabi-v7a' #armeabi-v7a x86
+MultiABI='armeabi-v7a x86' #armeabi-v7a x86
 
 # Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower
 AppMinimumRAM=0
diff --git a/project/jni/application/openttd/build-pc.sh b/project/jni/application/openttd/build-pc.sh
index 19512033c..8ad94e10c 100755
--- a/project/jni/application/openttd/build-pc.sh
+++ b/project/jni/application/openttd/build-pc.sh
@@ -7,7 +7,11 @@ mkdir -p openttd-pc openttd-pc/baseset
 cd openttd-pc
 [ -e bin/baseset ] || cp -a ../src/bin .
 
+export CFLAGS=-O0
+export CXXFLAGS=-O0
+
 [ -e Makefile ] || ../src/configure --enable-debug || exit 1
-make -j8 || exit 1
+make -j8 VERBOSE=1 || exit 1
 cd bin
-gdb -ex run ./openttd
+#gdb -ex run --args ./openttd
+./openttd -d 1 -r 854x480 -g opntitle.sav
diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src
index 4f77c2554..bb8e38c70 160000
--- a/project/jni/application/openttd/src
+++ b/project/jni/application/openttd/src
@@ -1 +1 @@
-Subproject commit 4f77c255469841f5739555088e3100507902a9eb
+Subproject commit bb8e38c70f5bbc1593110cafa79ba34b696051e5
diff --git a/todo.txt b/todo.txt
index 04575450a..130533ccf 100644
--- a/todo.txt
+++ b/todo.txt
@@ -31,12 +31,4 @@ TODO, which will get actually done
 
 - GemRB: update.
 
-- OpenTTD: position all 'build station' windows in the top-left corner.
-
-- OpenTTD: hide all windows when performing an action on the map, like laying tracks or creating station or selecting destination.
-
-- OpenTTD: railroad semaphore dialog buttons too big.
-
-- OpenTTD: select from menu with two taps, not tap and hold.
-
 - OpenTTD: tutorial.