From 6add84974691e7629fc0dbab67d4998d1a96b2a2 Mon Sep 17 00:00:00 2001 From: pelya Date: Tue, 8 Feb 2011 13:31:54 +0000 Subject: [PATCH] Fixed some timeout coefficients, updated fheroes2 project, updated todo --- .../fheroes2/AndroidAppSettings.cfg | 6 +++--- .../AndroidData/{data7.zip => data8.zip} | Bin 850245 -> 850252 bytes project/jni/application/src | 2 +- .../src/video/android/SDL_androidinput.c | 7 +++---- todo.txt | 6 ------ 5 files changed, 7 insertions(+), 14 deletions(-) rename project/jni/application/fheroes2/AndroidData/{data7.zip => data8.zip} (99%) diff --git a/project/jni/application/fheroes2/AndroidAppSettings.cfg b/project/jni/application/fheroes2/AndroidAppSettings.cfg index 2bc49947d..027bc1b74 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|data7.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" +AppDataDownloadUrl="Game data|data8.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 @@ -22,8 +22,8 @@ AppTouchscreenKeyboardKeysAmount=0 AppTouchscreenKeyboardKeysAmountAutoFire=0 RedefinedKeysScreenKb="LCTRL M T H E C SPACE C S L" MultiABI=n -AppVersionCode=224812 -AppVersionName="2248.12" +AppVersionCode=225012 +AppVersionName="2250.12" 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' diff --git a/project/jni/application/fheroes2/AndroidData/data7.zip b/project/jni/application/fheroes2/AndroidData/data8.zip similarity index 99% rename from project/jni/application/fheroes2/AndroidData/data7.zip rename to project/jni/application/fheroes2/AndroidData/data8.zip index 7b26407f82007b9d6d4fd7840e836ae1e98bd0b0..2115ad3486ea43ad56bcf8a59ce2cbeb6a7f836b 100644 GIT binary patch delta 858 zcmX^5$@t7CF7M2#)7Pc1l7LFFq7OocVEj;B@>+fcG*d=}2mea+=z_6B; zfq{oXh9NB@wJ1Ne*hnuqEj=`ZlY#l8eW344`#|5)3T_5QmKV$n3}B))#JB&JfxzD9 z;XP&g3QKQ0G`g;knGiO$YDLIO+ps9fYNmHq^G=jSyjcJK1}7(X^jDz|)%kWdb>D1l z5;diS9VY31t>-&sYvp8LJK-tc3cguu;#0rhw7sJAMo~cHZ2()5dVo@gPF(`8|Lpm* z>rZF}{+98((jX#c!=~}kbYbM5f)CrzewUZIwf4y?an`)YmYzxHjwy2pUx*a^!gz4u z@?)MUT@UL{ZVZ{G*~GXy%)v}CQ#5k+iB%t?+>F+5xwJFHQqH+vuC-ILCHGFFPw+!7 zt{)7OA91C9O!BB&y|<-WcY1fVVSseuE0syByb8`2w)7ZPv{}4)r*~9#i&ImV$e|2F z?Y_;a6Ay3F==*%!_1xEGn;$<;I{AOu=|>XN9r!Nk{IuY^^?I%24-?sR&A?NKb+>i~ zHGccBlZpT4^^R9b>ax=l`08gbZ#aAX`%$NO&h1Jp#jAI>RIi=h*JGKjzGiOhLY=v4 znKva4vn;ZeH|yDV=D_|}3f~`_H*uG1+%em&Q`>&HPmOzF%cPtSk;z+go?pJG>e?=u zSiYyj-shoes~M|`FuUEuYj=wDW474b-ZjtX`DDEVY#W+n4VAL}4%~hBaML4;dhgf< z)$onJ*Y14GFU;7p;a_9*n~3vwtW#$1=l}N0-^Xg^cNgjMW8M2y&zqmrGUL8AciWps zg1=iCzh0btG3(F%yxV(X`%Fs?=5H@LeC(0fVeOsbD^9kSF#a&#m1s17Yd+UW@p*~5 zjH{1z{Lnb4;TLN1=hBBJe+D-Hdb{eXIlL3S|2pzr_^`)Oz_j1+-Z6`bl@m*DeKPG` z*15Fr%pT_XQ5N^URPbwcnQ6&}erQ^*%eg#3rANK)dqG9aOzGpB-j8s z`Iq|J&1Uc{kL5*4(bHdj|He@q{xfPyg|a zCxmg!bl>khA&gh2FZ#|C#;7p;Cx~*L9`J)FmN9<%x*t3~jN7LF{=wtI*7%r*fq?-4 D)%}Tp delta 869 zcmX@}$@u6eF7M2#)7Pc1l7LFFq7OocVEj;B@>-GJu?0zq*v}fu>l;3G^j$drKDClzRkPY_^P90{>{~h9Ias``r!?MSox-8i&41(2<9FBJ z$wsPX%|F~KHQ`XxaRya8b(3y>zJL3Ef1K>Rd+MD(%MPUe@tibc^GA+DEG1zqwN3>u zRu&4)Osa?|(wUmtm2hAc?*w0uDA#Lho3i#yn|MZhZHZoJ-}4Fe?ukimiPGgtmqT_m zGT9wkv!gL`kJRLS*WwO0Put%8KWTy4qf4GDp;I5sO6HbK-Oz6F=5V`6`6Vt+tssuc zR~K36UvuSqy~sjeKFspHdHfvtu;E5JviYgQmO|S&9@R=am#~fg7v#32GW*}q;#uK8 zuP5yC_tmvCcb?wVDpD4GUib8#qaS?Uab^`MR?feFkz@1IMSJ}`>u3QlGA?hgfZGp5C6dv%N=o>hr!3w+0`%Db-LnL9+l~jfAGjL SuAk2IlgEXv>M;)k0|NjwPJ^}p diff --git a/project/jni/application/src b/project/jni/application/src index 104f796a6..59d41f41e 120000 --- a/project/jni/application/src +++ b/project/jni/application/src @@ -1 +1 @@ -ballfield \ No newline at end of file +fheroes2 \ No newline at end of file diff --git a/project/jni/sdl-1.3/src/video/android/SDL_androidinput.c b/project/jni/sdl-1.3/src/video/android/SDL_androidinput.c index 2966605f2..a2d7a2c4d 100644 --- a/project/jni/sdl-1.3/src/video/android/SDL_androidinput.c +++ b/project/jni/sdl-1.3/src/video/android/SDL_androidinput.c @@ -399,7 +399,6 @@ JAVA_EXPORT_NAME(DemoGLSurfaceView_nativeMouse) ( JNIEnv* env, jobject thiz, j y += diffY; relativeMovementX += diffX; relativeMovementY += diffY; - __android_log_print(ANDROID_LOG_INFO, "libSDL", "x %d y %d relX %d relY %d diffX %d diffY %d", x, y, relativeMovementX, relativeMovementY, diffX, diffY); diffX = x; diffY = y; @@ -418,9 +417,9 @@ JAVA_EXPORT_NAME(DemoGLSurfaceView_nativeMouse) ( JNIEnv* env, jobject thiz, j { if( mouseInitialX >= 0 && mouseInitialY >= 0 && ( leftClickMethod == LEFT_CLICK_WITH_TAP || leftClickMethod == LEFT_CLICK_WITH_TAP_OR_TIMEOUT ) && - abs(mouseInitialX - x) < SDL_ANDROID_sFakeWindowHeight / 6 && - abs(mouseInitialY - y) < SDL_ANDROID_sFakeWindowHeight / 6 && - SDL_GetTicks() - mouseInitialTime < 300 ) + abs(mouseInitialX - x) < SDL_ANDROID_sFakeWindowHeight / 8 && + abs(mouseInitialY - y) < SDL_ANDROID_sFakeWindowHeight / 8 && + SDL_GetTicks() - mouseInitialTime < 700 ) { SDL_ANDROID_MainThreadPushMouseMotion(mouseInitialX, mouseInitialY); SDL_ANDROID_MainThreadPushMouseButton( SDL_PRESSED, SDL_BUTTON_LEFT ); diff --git a/todo.txt b/todo.txt index 19a7ac16c..65b8cc81c 100644 --- a/todo.txt +++ b/todo.txt @@ -11,16 +11,10 @@ Bugs to fix - Show/hide screen controls with longpress on Text Edit button. -- Right click by longpress. - -- Option for touch screen to act like laptop touchpad. - - With 4:3 screen aspect ratio the on-screen buttons are not shown on the inactive part of screen. - Calling SDL_SetVideoMode() with SDL 1.3 several times makes it crash. -- Support for NDK r5b, when it's released. - - Support of libjnigraphics (it will disable on-screen keyboard) And that's all, I won't be doing any more development or fix other bugs (see bugs.txt for details).