From ab6eb14d16e68c34e66a85eef75cf54cd795a31a Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Mon, 9 Sep 2013 00:57:56 +0300
Subject: [PATCH] Forgot to disable debug

---
 .../biniax2/AndroidAppSettings.cfg            |   6 +++---
 .../application/biniax2/AndroidData/data3.zip | Bin 3003043 -> 3004215 bytes
 project/jni/application/biniax2/src/hof.c     |   7 +++++++
 .../jni/sdl-1.2/src/video/android/SDL_video.c |   4 +---
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/project/jni/application/biniax2/AndroidAppSettings.cfg b/project/jni/application/biniax2/AndroidAppSettings.cfg
index 68404f101..d1bcf5802 100644
--- a/project/jni/application/biniax2/AndroidAppSettings.cfg
+++ b/project/jni/application/biniax2/AndroidAppSettings.cfg
@@ -140,7 +140,7 @@ RedefinedKeysScreenKbNames="RETURN SPACE"
 
 # Redefine gamepad keys to SDL keysyms, button order is:
 # A B X Y L1 R1 L2 R2 LThumb RThumb
-RedefinedKeysGamepad="RETURN ESCAPE"
+RedefinedKeysGamepad="RETURN ESCAPE SPACE SPACE"
 
 # How long to show startup menu button, in msec, 0 to disable startup menu
 StartupMenuButtonTimeout=0
@@ -163,10 +163,10 @@ MultiABI=n
 AppMinimumRAM=0
 
 # Application version code (integer)
-AppVersionCode=1401
+AppVersionCode=1403
 
 # Application user-visible version name (string)
-AppVersionName="1.4.01"
+AppVersionName="1.4.03"
 
 # Reset SDL config when updating application to the new version (y) / (n)
 ResetSdlConfigForThisVersion=n
diff --git a/project/jni/application/biniax2/AndroidData/data3.zip b/project/jni/application/biniax2/AndroidData/data3.zip
index 5c411634c7bf184eeb82b6585b729f0a892fbcde..229dfbad510fd7530da2419ea660f3b1bed0f9f1 100644
GIT binary patch
delta 1899
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
E0CkNaSO5S3

delta 777
zcmdnKZad@RrP~=N^z!W}Gj>eO{WPhQm4TsxXX0#G4xdet0U*4+>Y(l{*6E4owH2Fh
zv9#Y}VQjy}!qk3?g}MC}3y9C!ev5^z{T2&*`z;oZ_FF8R?YCIC+HbLNx8GvnX}`t7
z+kT6Mul*JafBP*Kf%aQ0g6+3hgxYVh2)Ey25oy20BHDh7MXdc6i+KAj7K!#-ERyZF
zSftu-u}HVyVv%XT#Uk5&i$$*e7K?oQEf$6LTP%w0w^)?gZ?P!1-(pc|zr~{3ev3t|
z{T7RQ`z;oY_FF8P?YCI8+HbLFx8GvX*?x;fH*wE&k>k2c(fm05_;For7LX68PduwD
zI{m>VUAE~}r*#DcxEUlEAV7fOzhea3bi)(6{>*dP7^XWu5SN-h_k^w+v(i;2FmKvP
zT{q^04pA^?dNPQ2^r1M2r!f7@NnHo#$;uKSp44>BQ@U<UOQ%mSJf)k+thG=IB6?uH
z6x;N#r*s{dKSfGIgn~}%x-og2n?CEbZV=OibJO3Q){SMdd_LXxjBX;+A(`nL&ge!n
z87NNYJ*ykV9OS4p{hYm$!t}1Qx(>{%UZ_l$v(OTo{`jn}JJanC({;}2Mlm1cRh@3j
zqbfIj`8iz&rt50cU!K#AVVeD6y8C(EcqX>5(^s6=jb}FhrUucga6#9d*@;<w`aVW=
zndxm8bRC$N@v4Jtk(~bMg04GL4A*q+i@GsPH^irRUet|cR+7`2K2JtVW;*L7T?gg@
z6)lK4ahG)6nHhDprq^m~$xJ^2l3Qd6mXn>XenD4ey2E8%6()0+>1mgBqnM7@Pd{{7
zH=g-Tvo=I~U6VHZ^wdibb!^j<ujtA#@1Lwa-FlL??DU0KbRC!&E>3@ZMc1F%^`iFl
zgXguyrh8x2bzmxVnBIF;H=L<p?eu3L`lj!6`)j)4Ogn<7&$y<mFT%<Oid$_4ZHCSK
N3=Fpp=`t`d001rIA(j9D

diff --git a/project/jni/application/biniax2/src/hof.c b/project/jni/application/biniax2/src/hof.c
index d634d7ddf..d456bd1ab 100644
--- a/project/jni/application/biniax2/src/hof.c
+++ b/project/jni/application/biniax2/src/hof.c
@@ -28,6 +28,9 @@ For complete product license refer to LICENSE.TXT file
 INCLUDES
 ******************************************************************************/
 #include <string.h>
+#ifdef __ANDROID__
+#include <SDL_screenkeyboard.h>
+#endif
 
 #include "inc.h"
 
@@ -222,6 +225,10 @@ BNX_BOOL hofEnter( BNX_GAME *game )
 	strcpy( recEntry->name, "                             " );
 	recEntry->score = game->score[ cPlayer1 ];
 	inpInit();
+#ifdef __ANDROID__
+	SDL_ANDROID_SetScreenKeyboardHintMesage("Enter your name");
+	SDL_ANDROID_ToggleScreenKeyboardTextInput("");
+#endif
 	do
 	{
 		startTime = sysGetTime();
diff --git a/project/jni/sdl-1.2/src/video/android/SDL_video.c b/project/jni/sdl-1.2/src/video/android/SDL_video.c
index 8c243c185..be2e95e5b 100644
--- a/project/jni/sdl-1.2/src/video/android/SDL_video.c
+++ b/project/jni/sdl-1.2/src/video/android/SDL_video.c
@@ -2787,7 +2787,6 @@ SDL_RenderCopy(SDL_Texture * texture, const SDL_Rect * srcrect,
             return 0;
         }
     }
-    __android_log_print(ANDROID_LOG_INFO, "libSDL", "SDL_RenderCopy src %d:%d+%d+%d ", (int)real_srcrect.x, (int)real_srcrect.y, (int)real_srcrect.w, (int)real_srcrect.h);
 
     real_dstrect.x = 0;
     real_dstrect.y = 0;
@@ -2815,7 +2814,6 @@ SDL_RenderCopy(SDL_Texture * texture, const SDL_Rect * srcrect,
     }
 
 #if SDL_VIDEO_RENDER_RESIZE
-    __android_log_print(ANDROID_LOG_INFO, "libSDL", "SDL_RenderCopy src %d:%d+%d+%d dst %d:%d+%d+%d screen %d:%d", (int)real_srcrect.x, (int)real_srcrect.y, (int)real_srcrect.w, (int)real_srcrect.h, (int)real_dstrect.x, (int)real_dstrect.y, (int)real_dstrect.w, (int)real_dstrect.h, (int)window->display->desktop_mode.w, (int)window->display->desktop_mode.h);
     realW = window->display->desktop_mode.w - renderer->window->x;
     realH = window->display->desktop_mode.h - renderer->window->y;
     fakeW = window->w;
@@ -2834,7 +2832,7 @@ SDL_RenderCopy(SDL_Texture * texture, const SDL_Rect * srcrect,
         real_dstrect.y += renderer->window->y;
         real_dstrect.w -= renderer->window->x;
         real_dstrect.h -= renderer->window->y;
-        __android_log_print(ANDROID_LOG_INFO, "libSDL", "SDL_RenderCopy dst %d:%d+%d+%d realWH %d:%d", (int)real_dstrect.x, (int)real_dstrect.y, (int)real_dstrect.w, (int)real_dstrect.h, (int)realW, (int)realH);
+        //__android_log_print(ANDROID_LOG_INFO, "libSDL", "SDL_RenderCopy dst %d:%d+%d+%d realWH %d:%d", (int)real_dstrect.x, (int)real_dstrect.y, (int)real_dstrect.w, (int)real_dstrect.h, (int)realW, (int)realH);
     }
 #endif