diff --git a/project/jni/application/fheroes2/AndroidAppSettings.cfg b/project/jni/application/fheroes2/AndroidAppSettings.cfg index b4fd20f68..7d6ffa8d0 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="Heroes 2 DEMO (45 Mb) - required if you don't own full version|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^!Config files|data12.zip^!Fonts|data-cfg-fonts.zip^Russian translation|:fheroes2.cfg:fheroes2-ru.cfg^Czech translation|:fheroes2.cfg:fheroes2-cs.cfg^Spanish translation|:fheroes2.cfg:fheroes2-es.cfg^French translation|:fheroes2.cfg:fheroes2-fr.cfg^Hungarian translation|:fheroes2.cfg:fheroes2-hu.cfg^Polish translation|:fheroes2.cfg:fheroes2-pl.cfg^Portugese translation|:fheroes2.cfg:fheroes2-pt_BR.cfg^Swedish translation|:fheroes2.cfg:fheroes2-sv.cfg" +AppDataDownloadUrl="!Heroes 2 DEMO (45 Mb) - required if you don't own full version|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^!Engine files|data13.zip^!Engine fonts|data-cfg-fonts.zip^Russian translation|:fheroes2.cfg:fheroes2-ru.cfg^Czech translation|:fheroes2.cfg:fheroes2-cs.cfg^Spanish translation|:fheroes2.cfg:fheroes2-es.cfg^French translation|:fheroes2.cfg:fheroes2-fr.cfg^Hungarian translation|:fheroes2.cfg:fheroes2-hu.cfg^Polish translation|:fheroes2.cfg:fheroes2-pl.cfg^Portugese translation|:fheroes2.cfg:fheroes2-pt_BR.cfg^Swedish translation|:fheroes2.cfg:fheroes2-sv.cfg" VideoDepthBpp=16 NeedDepthBuffer=n NeedStencilBuffer=n @@ -25,22 +25,22 @@ AppUsesJoystick=n AppHandlesJoystickSensitivity=n AppUsesMultitouch=n NonBlockingSwapBuffers=n -RedefinedKeys="LCTRL M T H E" +RedefinedKeys="LCTRL T NO_REMAP NO_REMAP H" AppTouchscreenKeyboardKeysAmount=0 AppTouchscreenKeyboardKeysAmountAutoFire=0 -RedefinedKeysScreenKb="LCTRL M NO_REMAP NO_REMAP E C SPACE C S L" +RedefinedKeysScreenKb="LCTRL M SPACE C E C H T S L" StartupMenuButtonTimeout=3000 -HiddenMenuOptions='KeyboardConfigMainMenu ScreenKeyboardThemeConfig ScreenKeyboardTransparencyConfig' +HiddenMenuOptions='' FirstStartMenuOptions='' MultiABI=n -AppVersionCode=276118 -AppVersionName="2761.18" +AppVersionCode=286218 +AppVersionName="2862.18" ResetSdlConfigForThisVersion=n DeleteFilesOnUpgrade="libsdl-DownloadFinished-5.flag libsdl-DownloadFinished-6.flag libsdl-DownloadFinished-7.flag libsdl-DownloadFinished-8.flag libsdl-DownloadFinished-9.flag libsdl-DownloadFinished-10.flag libsdl-DownloadFinished-11.flag libsdl-DownloadFinished-12.flag libsdl-DownloadFinished-13.flag libsdl-DownloadFinished-14.flag" 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 -DWITH_AI=simple -DWITH_DEBUG -DWITH_EDITOR' # -DWITH_NET # network is disabled in rev 2761 AppLdflags='' -AppSubdirsBuild='fheroes2/src/engine/* fheroes2/src/xmlccwrap/* fheroes2/src/fheroes2/ai fheroes2/src/fheroes2/ai/simple fheroes2/src/fheroes2/agg fheroes2/src/fheroes2/algorithm fheroes2/src/fheroes2/army fheroes2/src/fheroes2/battle2 fheroes2/src/fheroes2/castle fheroes2/src/fheroes2/dialog fheroes2/src/fheroes2/editor fheroes2/src/fheroes2/game fheroes2/src/fheroes2/gui fheroes2/src/fheroes2/heroes fheroes2/src/fheroes2/image fheroes2/src/fheroes2/kingdom fheroes2/src/fheroes2/maps fheroes2/src/fheroes2/monster fheroes2/src/fheroes2/network fheroes2/src/fheroes2/objects fheroes2/src/fheroes2/pocketpc fheroes2/src/fheroes2/resource fheroes2/src/fheroes2/spell fheroes2/src/fheroes2/system fheroes2/src/fheroes2/test' +AppSubdirsBuild='fheroes2/src/engine fheroes2/src/xmlccwrap fheroes2/src/fheroes2/agg fheroes2/src/fheroes2/ai fheroes2/src/fheroes2/ai/simple fheroes2/src/fheroes2/army fheroes2/src/fheroes2/battle fheroes2/src/fheroes2/castle fheroes2/src/fheroes2/dialog fheroes2/src/fheroes2/editor fheroes2/src/fheroes2/game fheroes2/src/fheroes2/gui fheroes2/src/fheroes2/heroes fheroes2/src/fheroes2/image fheroes2/src/fheroes2/kingdom fheroes2/src/fheroes2/maps fheroes2/src/fheroes2/monster fheroes2/src/fheroes2/objects fheroes2/src/fheroes2/pocketpc fheroes2/src/fheroes2/resource fheroes2/src/fheroes2/spell fheroes2/src/fheroes2/system fheroes2/src/fheroes2/test' AppCmdline='fheroes2' ReadmeText='^You may press "Home" now - the data will be downloaded in background' diff --git a/project/jni/application/fheroes2/AndroidData/data12.zip b/project/jni/application/fheroes2/AndroidData/data12.zip deleted file mode 100644 index bf6df98e6..000000000 Binary files a/project/jni/application/fheroes2/AndroidData/data12.zip and /dev/null differ diff --git a/project/jni/application/fheroes2/AndroidData/data13.zip b/project/jni/application/fheroes2/AndroidData/data13.zip new file mode 100644 index 000000000..c8fd0fc92 Binary files /dev/null and b/project/jni/application/fheroes2/AndroidData/data13.zip differ diff --git a/project/jni/application/fheroes2/fheroes2.diff b/project/jni/application/fheroes2/fheroes2.diff deleted file mode 100644 index 15d9f3c40..000000000 --- a/project/jni/application/fheroes2/fheroes2.diff +++ /dev/null @@ -1,105 +0,0 @@ -Index: src/engine/tools.cpp -=================================================================== ---- src/engine/tools.cpp (revision 2769) -+++ src/engine/tools.cpp (working copy) -@@ -761,7 +761,7 @@ - if(stat(name.c_str(), &fs) || !S_ISREG(fs.st_mode)) - return false; - -- return writable ? 0 == access(name.c_str(), W_OK) : S_IRUSR & fs.st_mode; -+ return writable ? 0 == access(name.c_str(), W_OK) : true; - } - - bool IsDirectory(const std::string & name, bool writable) -Index: src/fheroes2/system/settings.h -=================================================================== ---- src/fheroes2/system/settings.h (revision 2769) -+++ src/fheroes2/system/settings.h (working copy) -@@ -104,9 +104,10 @@ - #elif defined(ANDROID) - namespace std - { -- #define endl "\n" -+ static const char * android_endl = "\n"; - } -- #define VERBOSE(x) { std::ostringstream osss; osss << x; __android_log_print(ANDROID_LOG_INFO, "FHeroes", "%s", osss.str().c_str()); } -+ #define endl android_endl -+ #define VERBOSE(x) if(true) { std::ostringstream osss; osss << x; __android_log_print(ANDROID_LOG_INFO, "FHeroes", "%s", osss.str().c_str()); } else String::GetTime() - #else - #define VERBOSE(x) std::cout << x << std::endl - #endif -Index: src/fheroes2/network/server.cpp -=================================================================== ---- src/fheroes2/network/server.cpp (revision 2769) -+++ src/fheroes2/network/server.cpp (working copy) -@@ -876,7 +876,7 @@ - - int FH2Server::RunServerProcess(void*) - { -- const std::string command = Settings::GetProgramPath(); -+ const std::string command = Settings::Get().GetProgramPath(); - std::ostringstream os; - os << command << " -s" << ">" << GetDirname(command) << SEPARATOR << "fh2server.log"; - return system(os.str().c_str()); -@@ -899,7 +899,7 @@ - - // clear background - cursor.Hide(); -- display.Blit(AGG::GetICN(ICN::HEROES, 0)); -+ AGG::GetICN(ICN::HEROES, 0).Blit(display); //display.Blit(AGG::GetICN(ICN::HEROES, 0)); // I think that's the expected logic - cursor.Show(); - display.Flip(); - } -Index: src/fheroes2/network/localclient.cpp -=================================================================== ---- src/fheroes2/network/localclient.cpp (revision 2769) -+++ src/fheroes2/network/localclient.cpp (working copy) -@@ -490,7 +490,7 @@ - { - MapsFileInfoList lists; - Network::PacketPopMapsFileInfoList(packet, lists); -- if(Maps::FileInfo *fi = Dialog::SelectScenario(lists)) -+ if(const Maps::FileInfo *fi = Dialog::SelectScenario(lists)) - { - // send set_maps_info - packet.Reset(); -@@ -626,7 +626,7 @@ - // clear background - const Sprite &back = AGG::GetICN(ICN::HEROES, 0); - cursor.Hide(); -- display.Blit(back); -+ back.Blit(display); //display.Blit(back); // I think that's the expected logic - cursor.Show(); - display.Flip(); - -Index: src/fheroes2/network/network.cpp -=================================================================== ---- src/fheroes2/network/network.cpp (revision 2769) -+++ src/fheroes2/network/network.cpp (working copy) -@@ -159,7 +159,9 @@ - Network::SetProtocolVersion(static_cast(MAJOR_VERSION << 8) | MINOR_VERSION); - - if(SDL::Init(INIT_TIMER)) -+#ifndef ANDROID - try -+#endif - { - std::atexit(SDL::Quit); - -@@ -177,6 +179,7 @@ - - return FH2Server::Main(NULL); - } -+#ifndef ANDROID - catch(std::bad_alloc) - { - } -@@ -184,7 +187,7 @@ - { - VERBOSE(conf.String()); - } -- -+#endif - return 0; - } -