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:
Sergii Pylypenko
2013-08-01 19:52:57 +03:00
parent e9feb051e1
commit b4402db83c
5 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
project/jni/application/openttd/AndroidAppSettings.cfg
View File

@@ -1,6 +1,6 @@
# The application settings for Android libSDL port
AppSettingVersion=18
AppSettingVersion=19
# libSDL version to use (1.2 or 1.3, specify 1.3 for SDL2)
LibSdlVersion=1.2
@@ -23,7 +23,7 @@ InhibitSuspend=n
# 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
# Also please avoid 'https://' URLs, many Android devices do not have trust certificates and will fail to connect to SF.net over HTTPS
AppDataDownloadUrl="!!Data files - 20 Mb|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/openttd-data-1.3.1.zip/download^!MIDI music support (18 Mb)|timidity.zip|http://sourceforge.net/projects/libsdl-android/files/timidity.zip^!!Config file|:.openttd/openttd.cfg:openttd-1.3.0.25.cfg"
AppDataDownloadUrl="!!Data files - 20 Mb|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/openttd-data-1.3.2.zip/download^!MIDI music support (18 Mb)|timidity.zip|http://sourceforge.net/projects/libsdl-android/files/timidity.zip^!!Config file|:.openttd/openttd.cfg:openttd-1.3.0.25.cfg"
# Video color depth - 16 BPP is the fastest and supported for all modes, 24 bpp is supported only
# with SwVideoMode=y, SDL_OPENGL mode supports everything. (16)/(24)/(32)
@@ -142,13 +142,13 @@ RedefinedKeysScreenKbNames="LALT RETURN KP_PLUS KP_MINUS SPACE DELETE KP_PLUS KP
StartupMenuButtonTimeout=3000
# Menu items to hide from startup menu, available menu items:
# OkButton DummyMenu MainMenu MouseConfigMainMenu KeyboardConfigMainMenu DownloadConfig OptionalDownloadConfig ScreenKeyboardSizeConfig ScreenKeyboardDrawSizeConfig ScreenKeyboardThemeConfig ScreenKeyboardTransparencyConfig AudioConfig DisplaySizeConfig LeftClickConfig RightClickConfig AdditionalMouseConfig JoystickMouseConfig TouchPressureMeasurementTool RemapHwKeysConfig RemapScreenKbConfig ScreenGesturesConfig CalibrateTouchscreenMenu CustomizeScreenKbLayout VideoSettingsConfig ShowReadme GyroscopeCalibration ResetToDefaultsConfig
HiddenMenuOptions='OptionalDownloadConfig'
# SettingsMenu.OkButton SettingsMenu.DummyMenu SettingsMenu.MainMenu SettingsMenuMisc.DownloadConfig SettingsMenuMisc.OptionalDownloadConfig SettingsMenuMisc.AudioConfig SettingsMenuMisc.VideoSettingsConfig SettingsMenuMisc.ShowReadme SettingsMenuMisc.GyroscopeCalibration SettingsMenuMisc.ResetToDefaultsConfig SettingsMenuMouse.MouseConfigMainMenu SettingsMenuMouse.DisplaySizeConfig SettingsMenuMouse.LeftClickConfig SettingsMenuMouse.RightClickConfig SettingsMenuMouse.AdditionalMouseConfig SettingsMenuMouse.JoystickMouseConfig SettingsMenuMouse.TouchPressureMeasurementTool SettingsMenuMouse.CalibrateTouchscreenMenu SettingsMenuKeyboard.KeyboardConfigMainMenu SettingsMenuKeyboard.ScreenKeyboardSizeConfig SettingsMenuKeyboard.ScreenKeyboardDrawSizeConfig SettingsMenuKeyboard.ScreenKeyboardThemeConfig SettingsMenuKeyboard.ScreenKeyboardTransparencyConfig SettingsMenuKeyboard.RemapHwKeysConfig SettingsMenuKeyboard.RemapScreenKbConfig SettingsMenuKeyboard.ScreenGesturesConfig SettingsMenuKeyboard.CustomizeScreenKbLayout
HiddenMenuOptions='SettingsMenuMisc.OptionalDownloadConfig'
# Menu items to show at startup - this is Java code snippet, leave empty for default:
# new Settings.ShowReadme(), (AppUsesMouse \&\& \! ForceRelativeMouseMode \? new Settings.DisplaySizeConfig(true) : new Settings.DummyMenu()), new Settings.OptionalDownloadConfig(true), new Settings.GyroscopeCalibration()
# Menu items to show at startup - this is Java code snippet, leave empty for default
# new SettingsMenuMisc.ShowReadme(), (AppUsesMouse \&\& \! ForceRelativeMouseMode \? new SettingsMenuMouse.DisplaySizeConfig(true) : new SettingsMenu.DummyMenu()), new SettingsMenuMisc.OptionalDownloadConfig(true), new SettingsMenuMisc.GyroscopeCalibration()
# Available menu items:
# new Settings.OkButton(), new Settings.DummyMenu(), new Settings.MainMenu(), new Settings.MouseConfigMainMenu(), new Settings.KeyboardConfigMainMenu(), new Settings.DownloadConfig(), new Settings.OptionalDownloadConfig(), new Settings.ScreenKeyboardSizeConfig(), new Settings.ScreenKeyboardDrawSizeConfig(), new Settings.ScreenKeyboardThemeConfig(), new Settings.ScreenKeyboardTransparencyConfig(), new Settings.AudioConfig(), new Settings.DisplaySizeConfig(), new Settings.LeftClickConfig(), new Settings.RightClickConfig(), new Settings.AdditionalMouseConfig(), new Settings.JoystickMouseConfig(), new Settings.TouchPressureMeasurementTool(), new Settings.RemapHwKeysConfig(), new Settings.RemapScreenKbConfig(), new Settings.ScreenGesturesConfig(), new Settings.CalibrateTouchscreenMenu(), new Settings.CustomizeScreenKbLayout(), new Settings.VideoSettingsConfig(), new Settings.ShowReadme(), new Settings.GyroscopeCalibration(), new Settings.ResetToDefaultsConfig(),
# SettingsMenu.OkButton SettingsMenu.DummyMenu SettingsMenu.MainMenu SettingsMenuMisc.DownloadConfig SettingsMenuMisc.OptionalDownloadConfig SettingsMenuMisc.AudioConfig SettingsMenuMisc.VideoSettingsConfig SettingsMenuMisc.ShowReadme SettingsMenuMisc.GyroscopeCalibration SettingsMenuMisc.ResetToDefaultsConfig SettingsMenuMouse.MouseConfigMainMenu SettingsMenuMouse.DisplaySizeConfig SettingsMenuMouse.LeftClickConfig SettingsMenuMouse.RightClickConfig SettingsMenuMouse.AdditionalMouseConfig SettingsMenuMouse.JoystickMouseConfig SettingsMenuMouse.TouchPressureMeasurementTool SettingsMenuMouse.CalibrateTouchscreenMenu SettingsMenuKeyboard.KeyboardConfigMainMenu SettingsMenuKeyboard.ScreenKeyboardSizeConfig SettingsMenuKeyboard.ScreenKeyboardDrawSizeConfig SettingsMenuKeyboard.ScreenKeyboardThemeConfig SettingsMenuKeyboard.ScreenKeyboardTransparencyConfig SettingsMenuKeyboard.RemapHwKeysConfig SettingsMenuKeyboard.RemapScreenKbConfig SettingsMenuKeyboard.ScreenGesturesConfig SettingsMenuKeyboard.CustomizeScreenKbLayout
FirstStartMenuOptions=''
# Enable multi-ABI binary, with hardware FPU support - it will also work on old devices,
@@ -159,10 +159,10 @@ MultiABI=n
AppMinimumRAM=0
# Application version code (integer)
AppVersionCode=13125
AppVersionCode=13225
# Application user-visible version name (string)
AppVersionName="1.3.1.25"
AppVersionName="1.3.2.25"
# Reset SDL config when updating application to the new version (y) / (n)
ResetSdlConfigForThisVersion=n

3
project/jni/application/openttd/AndroidBuild.sh
View File

@@ -2,11 +2,12 @@
LOCAL_PATH=`dirname $0`
LOCAL_PATH=`cd $LOCAL_PATH && pwd`
VER=1.3.1
VER=1.3.2
if [ \! -d openttd-$VER ] ; then
wget http://binaries.openttd.org/releases/$VER/openttd-$VER-source.tar.gz -O - | tar xvz && \
cp -a -f openttd-$VER openttd-$VER-orig && \
patch -p 0 -d openttd-$VER < openttd-trunk-android.patch && patch -p 0 -d openttd-$VER < findversion.sh.patch || exit 1
fi

1
project/jni/application/openttd/AndroidData/openttd-1.3.0.25.cfg
View File

@@ -14,6 +14,7 @@ medium_aa = true
large_aa = true
mono_aa = true
last_newgrf_count = 1
language = english.lng
[newgrf]
opengfx+biggui.grf =

56
project/jni/application/openttd/openttd-trunk-android.patch
View File

@@ -1,5 +1,5 @@
--- src/debug.cpp 2013-05-31 23:57:15.000000000 +0300
+++ src/debug.cpp 2013-06-02 17:34:54.700814123 +0300
--- src/debug.cpp 2013-07-27 18:09:40.000000000 +0300
+++ src/debug.cpp 2013-08-01 19:17:24.013408999 +0300
@@ -16,6 +16,9 @@
#include "string_func.h"
#include "fileio_func.h"
@@ -20,9 +20,9 @@
#if defined(ENABLE_NETWORK)
if (_debug_socket != INVALID_SOCKET) {
char buf2[1024 + 32];
--- src/fontcache.cpp 2013-05-31 23:57:15.000000000 +0300
+++ src/fontcache.cpp 2013-06-02 17:34:54.700814123 +0300
@@ -808,7 +808,15 @@
--- src/fontdetection.cpp 2013-07-27 18:09:39.000000000 +0300
+++ src/fontdetection.cpp 2013-08-01 19:19:43.089408999 +0300
@@ -772,7 +772,15 @@
return ret;
}
@@ -39,8 +39,8 @@
FT_Error GetFontByFaceName(const char *font_name, FT_Face *face) {return FT_Err_Cannot_Open_Resource;}
bool SetFallbackFont(FreeTypeSettings *settings, const char *language_isocode, int winlangid, MissingGlyphSearcher *callback) { return false; }
#endif /* WITH_FONTCONFIG */
--- src/music/libtimidity.cpp 2013-05-31 23:56:52.000000000 +0300
+++ src/music/libtimidity.cpp 2013-06-02 17:34:54.700814123 +0300
--- src/music/libtimidity.cpp 2013-07-27 18:09:28.000000000 +0300
+++ src/music/libtimidity.cpp 2013-08-01 19:17:24.013408999 +0300
@@ -13,6 +13,7 @@
#include "../openttd.h"
#include "../sound_type.h"
@@ -82,8 +82,8 @@
/** Factory for the libtimidity driver. */
static FMusicDriver_LibTimidity iFMusicDriver_LibTimidity;
--- src/network/core/os_abstraction.h 2013-05-31 23:57:06.000000000 +0300
+++ src/network/core/os_abstraction.h 2013-06-02 17:34:54.700814123 +0300
--- src/network/core/os_abstraction.h 2013-07-27 18:09:36.000000000 +0300
+++ src/network/core/os_abstraction.h 2013-08-01 19:17:24.013408999 +0300
@@ -161,7 +161,7 @@
# include <net/if.h>
/* According to glibc/NEWS, <ifaddrs.h> appeared in glibc-2.3. */
@@ -93,8 +93,8 @@
/* If for any reason ifaddrs.h does not exist on your system, comment out
* the following two lines and an alternative way will be used to fetch
* the list of IPs from the system. */
--- src/os/unix/crashlog_unix.cpp 2013-05-31 23:56:54.000000000 +0300
+++ src/os/unix/crashlog_unix.cpp 2013-06-02 17:34:54.700814123 +0300
--- src/os/unix/crashlog_unix.cpp 2013-07-27 18:09:32.000000000 +0300
+++ src/os/unix/crashlog_unix.cpp 2013-08-01 19:17:24.017408999 +0300
@@ -141,7 +141,11 @@
};
@@ -107,8 +107,8 @@
/**
* Entry point for the crash handler.
--- src/os/unix/unix.cpp 2013-05-31 23:56:54.000000000 +0300
+++ src/os/unix/unix.cpp 2013-06-02 17:34:54.704814123 +0300
--- src/os/unix/unix.cpp 2013-07-27 18:09:32.000000000 +0300
+++ src/os/unix/unix.cpp 2013-08-01 19:17:24.017408999 +0300
@@ -25,7 +25,7 @@
#ifdef __APPLE__
@@ -130,8 +130,8 @@
int CDECL main(int argc, char *argv[])
{
int ret;
--- src/osk_gui.cpp 2013-05-31 23:57:15.000000000 +0300
+++ src/osk_gui.cpp 2013-06-02 17:41:23.344810333 +0300
--- src/osk_gui.cpp 2013-07-27 18:09:40.000000000 +0300
+++ src/osk_gui.cpp 2013-08-01 19:17:24.017408999 +0300
@@ -21,6 +21,9 @@
#include "table/sprites.h"
@@ -159,8 +159,8 @@
}
/**
--- src/script/api/script_date.cpp 2013-05-31 23:57:01.000000000 +0300
+++ src/script/api/script_date.cpp 2013-06-02 17:34:54.704814123 +0300
--- src/script/api/script_date.cpp 2013-07-27 18:09:35.000000000 +0300
+++ src/script/api/script_date.cpp 2013-08-01 19:17:24.017408999 +0300
@@ -9,8 +9,8 @@
/** @file script_date.cpp Implementation of ScriptDate. */
@@ -171,8 +171,8 @@
#include "script_date.hpp"
#include "../../date_func.h"
--- src/sound/sdl_s.cpp 2013-05-31 23:56:51.000000000 +0300
+++ src/sound/sdl_s.cpp 2013-06-02 17:34:54.704814123 +0300
--- src/sound/sdl_s.cpp 2013-07-27 18:09:28.000000000 +0300
+++ src/sound/sdl_s.cpp 2013-08-01 19:17:24.017408999 +0300
@@ -21,6 +21,10 @@
/** Factory for the SDL sound driver. */
static FSoundDriver_SDL iFSoundDriver_SDL;
@@ -194,8 +194,8 @@
}
const char *SoundDriver_SDL::Start(const char * const *parm)
--- src/video/sdl_v.cpp 2013-05-31 23:56:34.000000000 +0300
+++ src/video/sdl_v.cpp 2013-06-02 17:34:54.704814123 +0300
--- src/video/sdl_v.cpp 2013-07-27 18:09:22.000000000 +0300
+++ src/video/sdl_v.cpp 2013-08-01 19:17:24.017408999 +0300
@@ -25,6 +25,9 @@
#include "../fileio_func.h"
#include "sdl_v.h"
@@ -206,7 +206,7 @@
static FVideoDriver_SDL iFVideoDriver_SDL;
@@ -348,6 +351,15 @@
@@ -349,6 +352,15 @@
* surface, for example). */
_requested_hwpalette = want_hwpalette;
@@ -222,7 +222,7 @@
/* DO NOT CHANGE TO HWSURFACE, IT DOES NOT WORK */
newscreen = SDL_CALL SDL_SetVideoMode(w, h, bpp, SDL_SWSURFACE | (want_hwpalette ? SDL_HWPALETTE : 0) | (_fullscreen ? SDL_FULLSCREEN : SDL_RESIZABLE));
if (newscreen == NULL) {
@@ -515,6 +527,8 @@
@@ -521,6 +533,8 @@
if (sym->scancode == 49) key = WKC_BACKSPACE;
#elif defined(__sgi__)
if (sym->scancode == 22) key = WKC_BACKQUOTE;
@@ -231,7 +231,7 @@
#else
if (sym->scancode == 49) key = WKC_BACKQUOTE;
#endif
@@ -590,7 +604,7 @@
@@ -596,7 +610,7 @@
}
HandleMouseEvents();
break;
@@ -240,7 +240,7 @@
case SDL_ACTIVEEVENT:
if (!(ev.active.state & SDL_APPMOUSEFOCUS)) break;
@@ -601,7 +615,7 @@
@@ -607,7 +621,7 @@
_cursor.in_window = false;
}
break;
@@ -249,7 +249,7 @@
case SDL_QUIT:
HandleExitGameRequest();
break;
@@ -614,13 +628,14 @@
@@ -620,13 +634,14 @@
HandleKeypress(ConvertSdlKeyIntoMy(&ev.key.keysym));
}
break;
@@ -265,8 +265,8 @@
case SDL_VIDEOEXPOSE: {
/* Force a redraw of the entire screen. Note
* that SDL 1.2 seems to do this automatically
@@ -654,6 +669,9 @@
SDL_CALL SDL_EnableUNICODE(1);
@@ -658,6 +673,9 @@
SetupKeyboard();
_draw_threaded = GetDriverParam(parm, "no_threads") == NULL && GetDriverParam(parm, "no_thread") == NULL;
+#ifdef __ANDROID__

2
todo.txt
View File

@@ -27,8 +27,6 @@ Requested features (see also bugs.txt)
- TeeWorlds: external mouse support.
- OpenTTD: make English the default language, because there are no fonts for many languages.
- UQM: On-screen buttons are re-appearing when using gamepad and switching between game screens.
- UQM: Redesign gamepad controls.