From 5bdd6e742dc2b801e5e2f7001b0e8e0a39e69f49 Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Wed, 24 Nov 2010 20:59:48 +0200
Subject: [PATCH] Updated OpenTTD project

---
 .../jni/application/openttd/AndroidAppSettings.cfg |  2 +-
 .../openttd/openttd-trunk-android.patch            | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg
index bf130ce70..3c4ce1bbd 100644
--- a/project/jni/application/openttd/AndroidAppSettings.cfg
+++ b/project/jni/application/openttd/AndroidAppSettings.cfg
@@ -17,7 +17,7 @@ AppUsesJoystick=n
 AppHandlesJoystickSensitivity=n
 AppUsesMultitouch=n
 NonBlockingSwapBuffers=n
-RedefinedKeys="LALT RETURN KP_PLUS KP_MINUS DELETE ESCAPE"
+RedefinedKeys="LALT RETURN KP_PLUS KP_MINUS SPACE DELETE"
 AppTouchscreenKeyboardKeysAmount=0
 AppTouchscreenKeyboardKeysAmountAutoFire=0
 MultiABI=n
diff --git a/project/jni/application/openttd/openttd-trunk-android.patch b/project/jni/application/openttd/openttd-trunk-android.patch
index 4e8858b3e..8aeff6e6d 100644
--- a/project/jni/application/openttd/openttd-trunk-android.patch
+++ b/project/jni/application/openttd/openttd-trunk-android.patch
@@ -154,3 +154,17 @@ Index: src/debug.cpp
  #if defined(ENABLE_NETWORK)
  	if (_debug_socket != INVALID_SOCKET) {
  		char buf2[1024 + 32];
+Index: src/main_gui.cpp
+===================================================================
+--- src/main_gui.cpp	(revision 21311)
++++ src/main_gui.cpp	(working copy)
+@@ -275,6 +275,9 @@
+ 			}
+ 
+ 			case WKC_ESC: ResetObjectToPlace(); break;
++#ifdef ANDROID
++			case WKC_DELETE: DeleteAllNonVitalWindows(); break;
++#endif
+ 			case WKC_DELETE: DeleteNonVitalWindows(); break;
+ 			case WKC_DELETE | WKC_SHIFT: DeleteAllNonVitalWindows(); break;
+ 			case 'R' | WKC_CTRL: MarkWholeScreenDirty(); break;