From 714a1a632ad7c9fcb4fad08663be73825ca8d3b4 Mon Sep 17 00:00:00 2001 From: pelya Date: Fri, 24 Dec 2010 11:32:16 +0000 Subject: [PATCH] Updated OpenTTD and fheroes2 projects --- .../fheroes2/AndroidAppSettings.cfg | 8 ++++---- .../AndroidData/{data4.zip => data5.zip} | Bin 845802 -> 848055 bytes .../openttd-lowmem/AndroidAppSettings.cfg | 4 ++-- .../openttd/AndroidAppSettings.cfg | 4 ++-- .../openttd/openttd-trunk-android.patch | 11 ++++++++++- project/jni/application/src | 2 +- 6 files changed, 19 insertions(+), 10 deletions(-) rename project/jni/application/fheroes2/AndroidData/{data4.zip => data5.zip} (98%) diff --git a/project/jni/application/fheroes2/AndroidAppSettings.cfg b/project/jni/application/fheroes2/AndroidAppSettings.cfg index 5f6935694..6d589b0a8 100644 --- a/project/jni/application/fheroes2/AndroidAppSettings.cfg +++ b/project/jni/application/fheroes2/AndroidAppSettings.cfg @@ -5,7 +5,7 @@ AppName="Free Heroes 2" AppFullName=net.sourceforge.fheroes2 ScreenOrientation=h InhibitSuspend=n -AppDataDownloadUrl="Game data|data4.zip^Heroes 2 DEMO data files (45 Mb)|http://downloads.pcworld.com/pub/new/fun_and_games/adventure_strategy/h2demo.zip|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/h2demo.zip/download^MIDI music support (18 Mb)|http://sourceforge.net/projects/libsdl-android/files/timidity.zip/download^Essential map pack (9 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/EssentialMapPack.zip/download^Additional map pack (95 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/AdditionalMapPack.zip/download^Mega map pack (280 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/MegaMapPack.zip/download" +AppDataDownloadUrl="Game data|data5.zip^Heroes 2 DEMO data files (45 Mb)|http://downloads.pcworld.com/pub/new/fun_and_games/adventure_strategy/h2demo.zip|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/h2demo.zip/download^MIDI music support (18 Mb)|http://sourceforge.net/projects/libsdl-android/files/timidity.zip/download^Essential map pack (9 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/EssentialMapPack.zip/download^Additional map pack (95 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/AdditionalMapPack.zip/download^Mega map pack (280 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/MegaMapPack.zip/download^Russian translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-ru.cfg/download^Czech translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-cs.cfg/download^Spanish translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-es.cfg/download^French translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-fr.cfg/download^Hungarian translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-hu.cfg/download^Polish translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-pl.cfg/download^Portugese translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-pt.cfg/download^Swedish translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-sv.cfg/download" SdlVideoResize=y SdlVideoResizeKeepAspect=n NeedDepthBuffer=n @@ -20,10 +20,10 @@ NonBlockingSwapBuffers=n RedefinedKeys="LCTRL M T H E" AppTouchscreenKeyboardKeysAmount=0 AppTouchscreenKeyboardKeysAmountAutoFire=0 -RedefinedKeysScreenKb="LCTRL M T H" +RedefinedKeysScreenKb="LCTRL M T H E C SPACE C S L" MultiABI=n -AppVersionCode=214608 -AppVersionName="2146.08" +AppVersionCode=214708 +AppVersionName="2147.08" CompiledLibraries="sdl_net sdl_mixer sdl_image sdl_ttf png intl" CustomBuildScript=n AppCflags='-finline-functions -O2 -DWITH_ZLIB -DWITH_MIXER -DWITH_XML -DWITH_IMAGE -DWITH_TTF' diff --git a/project/jni/application/fheroes2/AndroidData/data4.zip b/project/jni/application/fheroes2/AndroidData/data5.zip similarity index 98% rename from project/jni/application/fheroes2/AndroidData/data4.zip rename to project/jni/application/fheroes2/AndroidData/data5.zip index 6df697fef38a642e55a2f03bfe8f483019a7a510..e0ac3b6e18d00d1bc7619f7a2bd03aefb27bccdb 100644 GIT binary patch delta 13634 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 diff --git a/project/jni/application/openttd-lowmem/AndroidAppSettings.cfg b/project/jni/application/openttd-lowmem/AndroidAppSettings.cfg index 5de436150..931e00eef 100644 --- a/project/jni/application/openttd-lowmem/AndroidAppSettings.cfg +++ b/project/jni/application/openttd-lowmem/AndroidAppSettings.cfg @@ -22,8 +22,8 @@ AppTouchscreenKeyboardKeysAmount=0 AppTouchscreenKeyboardKeysAmountAutoFire=0 RedefinedKeysScreenKb="LALT RETURN KP_PLUS KP_MINUS SPACE DELETE KP_PLUS KP_MINUS 1 2" MultiABI=n -AppVersionCode=10507 -AppVersionName="1.0.5.07" +AppVersionCode=10508 +AppVersionName="1.0.5.08" CompiledLibraries="png lzo2" CustomBuildScript=y AppCflags='' diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index 14a6880c7..c66887f42 100644 --- a/project/jni/application/openttd/AndroidAppSettings.cfg +++ b/project/jni/application/openttd/AndroidAppSettings.cfg @@ -22,8 +22,8 @@ AppTouchscreenKeyboardKeysAmount=0 AppTouchscreenKeyboardKeysAmountAutoFire=0 RedefinedKeysScreenKb="LALT RETURN KP_PLUS KP_MINUS SPACE DELETE KP_PLUS KP_MINUS 1 2" MultiABI=n -AppVersionCode=10507 -AppVersionName="1.0.5.07" +AppVersionCode=10508 +AppVersionName="1.0.5.08" CompiledLibraries="jpeg png freetype timidity lzma lzo2" CustomBuildScript=y AppCflags='' diff --git a/project/jni/application/openttd/openttd-trunk-android.patch b/project/jni/application/openttd/openttd-trunk-android.patch index 1f1bb8f23..e6c1809e3 100644 --- a/project/jni/application/openttd/openttd-trunk-android.patch +++ b/project/jni/application/openttd/openttd-trunk-android.patch @@ -2,7 +2,16 @@ Index: src/video/sdl_v.cpp =================================================================== --- src/video/sdl_v.cpp (revision 21311) +++ src/video/sdl_v.cpp (working copy) -@@ -485,6 +485,9 @@ +@@ -354,6 +354,8 @@ + if (sym->scancode == 49) key = WKC_BACKSPACE; + #elif defined(__sgi__) + if (sym->scancode == 22) key = WKC_BACKQUOTE; ++#elif defined(ANDROID) ++ if (sym->scancode == SDLK_BACKQUOTE) key = WKC_BACKQUOTE; + #else + if (sym->scancode == 49) key = WKC_BACKQUOTE; + #endif +@@ -485,6 +487,9 @@ SDL_CALL SDL_EnableUNICODE(1); _draw_threaded = GetDriverParam(parm, "no_threads") == NULL && GetDriverParam(parm, "no_thread") == NULL; diff --git a/project/jni/application/src b/project/jni/application/src index 550b7b622..59d41f41e 120000 --- a/project/jni/application/src +++ b/project/jni/application/src @@ -1 +1 @@ -openttd \ No newline at end of file +fheroes2 \ No newline at end of file