miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated OpenTTD

Browse Source
This commit is contained in:
pelya
2010-12-23 17:01:37 +00:00
parent 1228dbe4b0
commit 31b9a69083
4 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
project/jni/application/openttd-lowmem/AndroidAppSettings.cfg
+4 -3
View File
@@ -1,5 +1,5 @@
# The application settings for Android libSDL port
AppSettingVersion=15
AppSettingVersion=16
LibSdlVersion=1.2
AppName="OpenTTD-lowmem"
AppFullName=org.openttd.sdl.lowmem
@@ -20,9 +20,10 @@ NonBlockingSwapBuffers=n
RedefinedKeys="LALT RETURN KP_PLUS KP_MINUS DELETE"
AppTouchscreenKeyboardKeysAmount=0
AppTouchscreenKeyboardKeysAmountAutoFire=0
RedefinedKeysScreenKb="LALT RETURN KP_PLUS KP_MINUS SPACE DELETE KP_PLUS KP_MINUS 1 2"
MultiABI=n
AppVersionCode=10506
AppVersionName="1.0.5.06"
AppVersionCode=10507
AppVersionName="1.0.5.07"
CompiledLibraries="png lzo2"
CustomBuildScript=y
AppCflags=''
project/jni/application/openttd/AndroidAppSettings.cfg
+4 -3
View File
@@ -1,5 +1,5 @@
# The application settings for Android libSDL port
AppSettingVersion=15
AppSettingVersion=16
LibSdlVersion=1.2
AppName="OpenTTD"
AppFullName=org.openttd.sdl
@@ -20,9 +20,10 @@ NonBlockingSwapBuffers=n
RedefinedKeys="LALT RETURN KP_PLUS KP_MINUS SPACE DELETE"
AppTouchscreenKeyboardKeysAmount=0
AppTouchscreenKeyboardKeysAmountAutoFire=0
RedefinedKeysScreenKb="LALT RETURN KP_PLUS KP_MINUS SPACE DELETE KP_PLUS KP_MINUS 1 2"
MultiABI=n
AppVersionCode=10506
AppVersionName="1.0.5.06"
AppVersionCode=10507
AppVersionName="1.0.5.07"
CompiledLibraries="jpeg png freetype timidity lzma lzo2"
CustomBuildScript=y
AppCflags=''
project/jni/application/openttd/openttd-trunk-android.patch
+23 -8
View File
@@ -1,6 +1,6 @@
Index: src/video/sdl_v.cpp
===================================================================
--- src/video/sdl_v.cpp (revision 21293)
--- src/video/sdl_v.cpp (revision 21311)
+++ src/video/sdl_v.cpp (working copy)
@@ -485,6 +485,9 @@
SDL_CALL SDL_EnableUNICODE(1);
@@ -14,7 +14,7 @@ Index: src/video/sdl_v.cpp
}
Index: src/sound/sdl_s.cpp
===================================================================
--- src/sound/sdl_s.cpp (revision 21293)
--- src/sound/sdl_s.cpp (revision 21311)
+++ src/sound/sdl_s.cpp (working copy)
@@ -20,9 +20,16 @@
@@ -35,7 +35,7 @@ Index: src/sound/sdl_s.cpp
const char *SoundDriver_SDL::Start(const char * const *parm)
Index: src/music/libtimidity.cpp
===================================================================
--- src/music/libtimidity.cpp (revision 21293)
--- src/music/libtimidity.cpp (revision 21311)
+++ src/music/libtimidity.cpp (working copy)
@@ -23,10 +23,13 @@
#include <sys/stat.h>
@@ -78,7 +78,7 @@ Index: src/music/libtimidity.cpp
Index: src/os/unix/unix.cpp
===================================================================
--- src/os/unix/unix.cpp (revision 21293)
--- src/os/unix/unix.cpp (revision 21311)
+++ src/os/unix/unix.cpp (working copy)
@@ -24,7 +24,7 @@
@@ -103,7 +103,7 @@ Index: src/os/unix/unix.cpp
int ret;
Index: src/os/unix/crashlog_unix.cpp
===================================================================
--- src/os/unix/crashlog_unix.cpp (revision 21293)
--- src/os/unix/crashlog_unix.cpp (revision 21311)
+++ src/os/unix/crashlog_unix.cpp (working copy)
@@ -141,7 +141,11 @@
};
@@ -117,9 +117,24 @@ Index: src/os/unix/crashlog_unix.cpp
/**
* Entry point for the crash handler.
Index: src/window.cpp
===================================================================
--- src/window.cpp (revision 21311)
+++ src/window.cpp (working copy)
@@ -2053,6 +2053,10 @@
static void MouseLoop(MouseClick click, int mousewheel)
{
+#ifdef ANDROID
+ _settings_client.gui.left_mouse_btn_scrolling = true;
+#endif
+
HandlePlacePresize();
UpdateTileSelection();
Index: src/network/core/os_abstraction.h
===================================================================
--- src/network/core/os_abstraction.h (revision 21293)
--- src/network/core/os_abstraction.h (revision 21311)
+++ src/network/core/os_abstraction.h (working copy)
@@ -159,7 +159,7 @@
# include <net/if.h>
@@ -132,7 +147,7 @@ Index: src/network/core/os_abstraction.h
* the list of IPs from the system. */
Index: src/debug.cpp
===================================================================
--- src/debug.cpp (revision 21293)
--- src/debug.cpp (revision 21311)
+++ src/debug.cpp (working copy)
@@ -16,6 +16,9 @@
#include "string_func.h"
@@ -156,7 +171,7 @@ Index: src/debug.cpp
char buf2[1024 + 32];
Index: src/main_gui.cpp
===================================================================
--- src/main_gui.cpp (revision 21293)
--- src/main_gui.cpp (revision 21311)
+++ src/main_gui.cpp (working copy)
@@ -275,7 +275,11 @@
}
project/jni/application/src
+1 -1
View File
@@ -1 +1 @@
ballfield
openttd