From bd5955ab3d1278fee563d4694939f316f0192b22 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Wed, 19 Mar 2014 20:08:32 +0200 Subject: [PATCH] XRick: fixed some crashes --- .../application/xrick/AndroidAppSettings.cfg | 8 ++--- .../application/xrick/AndroidData/data.zip | Bin 1457440 -> 1470046 bytes .../xrick/xrick-021212/src/e_them.c | 4 ++- .../application/xrick/xrick-021212/src/game.c | 2 ++ .../xrick/xrick-021212/src/scr_getname.c | 29 +++++++++++++----- .../xrick/xrick-021212/src/sysarg.c | 9 ++++++ 6 files changed, 39 insertions(+), 13 deletions(-) diff --git a/project/jni/application/xrick/AndroidAppSettings.cfg b/project/jni/application/xrick/AndroidAppSettings.cfg index f79097c28..8731f5435 100644 --- a/project/jni/application/xrick/AndroidAppSettings.cfg +++ b/project/jni/application/xrick/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="XRick" AppFullName=net.xrick.sdl # Application version code (integer) -AppVersionCode=102121203 +AppVersionCode=102121205 # Application user-visible version name (string) -AppVersionName="021212.03" +AppVersionName="021212.05" # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...' # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu @@ -24,7 +24,7 @@ AppDataDownloadUrl="!Data size is 1 Mb|:data.zip:data.zip" ResetSdlConfigForThisVersion=y # Delete application data files when upgrading (specify file/dir paths separated by spaces) -DeleteFilesOnUpgrade="%" +DeleteFilesOnUpgrade="libsdl-DownloadFinished-0.flag" # Here you may type readme text, which will be shown during startup. Format is: # Text in English, use \\\\n to separate lines (that's four backslashes)^de:Text in Deutsch^ru:Text in Russian^button:Button that will open some URL:http://url-to-open/ @@ -223,7 +223,7 @@ AppSubdirsBuild='xrick-021212/src/* xrick-021212/include/*' AppBuildExclude='' # Application command line parameters, including app name as 0-th param -AppCmdline='' +AppCmdline='xrick' # Screen size is used by Google Play to prevent an app to be installed on devices with smaller screens # Minimum screen size that application supports: (s)mall / (m)edium / (l)arge diff --git a/project/jni/application/xrick/AndroidData/data.zip b/project/jni/application/xrick/AndroidData/data.zip index 5d9c1f7d8c673328a8ca4c05826b43078fc5d27d..52f3093de0a7d78b3dc144ad0d307aeeeada2389 100644 GIT binary patch delta 12783 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 P3_a`&413bV7#J7;*uFf6 delta 80 zcmcb2Cvw5Bh=vx%7N!>F7M2#)7Pc1l7LFFq7OocV7M>Q~7QPn#7J(MQ7NHj57LgXw kEn-(qx9>|6GiMiJWn*AqV31>wV=!lDV7P25#=yV;06~ux`v3p{ diff --git a/project/jni/application/xrick/xrick-021212/src/e_them.c b/project/jni/application/xrick/xrick-021212/src/e_them.c index 7fecf56a3..49cb4cfb6 100644 --- a/project/jni/application/xrick/xrick-021212/src/e_them.c +++ b/project/jni/application/xrick/xrick-021212/src/e_them.c @@ -689,7 +689,9 @@ e_them_t3_action2(U8 e) * FIXME is it 8 of them, not 10? * FIXME testing below... */ - syssnd_play(WAV_ENTITY[(ent_ents[e].trigsnd & 0x1F) - 0x14], 1); + if ((ent_ents[e].trigsnd & 0x1F) - 0x14 >= 0 && + (ent_ents[e].trigsnd & 0x1F) - 0x14 < 10) + syssnd_play(WAV_ENTITY[(ent_ents[e].trigsnd & 0x1F) - 0x14], 1); /*syssnd_play(WAV_ENTITY[0], 1);*/ #endif ent_ents[e].n &= ~ENT_LETHAL; diff --git a/project/jni/application/xrick/xrick-021212/src/game.c b/project/jni/application/xrick/xrick-021212/src/game.c index 02408ac70..2df3fa757 100644 --- a/project/jni/application/xrick/xrick-021212/src/game.c +++ b/project/jni/application/xrick/xrick-021212/src/game.c @@ -626,6 +626,7 @@ play0(void) } if (control_last == CONTROL_EXIT) { /* request to exit the game */ + map_saveProgress(); game_state = EXIT; return; } @@ -751,6 +752,7 @@ loaddata() WAV_ENTITY[6] = syssnd_load("sounds/ent6.wav"); WAV_ENTITY[7] = syssnd_load("sounds/ent7.wav"); WAV_ENTITY[8] = syssnd_load("sounds/ent8.wav"); + WAV_ENTITY[9] = syssnd_load("sounds/ent9.wav"); #endif } diff --git a/project/jni/application/xrick/xrick-021212/src/scr_getname.c b/project/jni/application/xrick/xrick-021212/src/scr_getname.c index 652175f78..c5bab0e48 100644 --- a/project/jni/application/xrick/xrick-021212/src/scr_getname.c +++ b/project/jni/application/xrick/xrick-021212/src/scr_getname.c @@ -111,6 +111,8 @@ screen_getname(void) case 2: /* wait for key pressed */ #ifdef __ANDROID__ + /* It deadlocks for some reason */ + /* name[0] = 0; SDL_ANDROID_SetScreenKeyboardHintMesage("Please enter your name"); SDL_ANDROID_GetScreenKeyboardTextInput(name, 10); @@ -124,9 +126,10 @@ screen_getname(void) x = 5; y = 4; seq = 3; + */ #endif - if (control_status & CONTROL_FIRE || KEY_BULLET) + if (control_status & CONTROL_FIRE || KEY_BULLET || KEY_BOMB || KEY_STICK) seq = 3; if (control_status & CONTROL_UP) { if (y > 0) { @@ -147,21 +150,31 @@ screen_getname(void) seq = 5; } if (control_status & CONTROL_LEFT) { + pointer_show(FALSE); if (x > 0) { - pointer_show(FALSE); x--; - pointer_show(TRUE); - tm = sys_gettime(); + } else { + if (y > 0) { + x = 5; + y--; + } } + pointer_show(TRUE); + tm = sys_gettime(); seq = 6; } if (control_status & CONTROL_RIGHT) { + pointer_show(FALSE); if (x < 5) { - pointer_show(FALSE); x++; - pointer_show(TRUE); - tm = sys_gettime(); + } else { + if (y < 4) { + x = 0; + y++; + } } + pointer_show(TRUE); + tm = sys_gettime(); seq = 7; } if (seq == 2) @@ -169,7 +182,7 @@ screen_getname(void) break; case 3: /* wait for FIRE released */ - if (!(control_status & CONTROL_FIRE || KEY_BULLET)) { + if (!(control_status & CONTROL_FIRE || KEY_BULLET || KEY_BOMB || KEY_STICK)) { if (x == 5 && y == 4) { /* end */ i = 0; while (game_score < game_hscores[i].score) diff --git a/project/jni/application/xrick/xrick-021212/src/sysarg.c b/project/jni/application/xrick/xrick-021212/src/sysarg.c index 807193c0c..6cf1a5f04 100644 --- a/project/jni/application/xrick/xrick-021212/src/sysarg.c +++ b/project/jni/application/xrick/xrick-021212/src/sysarg.c @@ -203,6 +203,15 @@ sysarg_init(int argc, char **argv) if (++i == argc) sysarg_fail("missing data"); sysarg_args_data = argv[i]; } + else if (!strcmp(argv[i], "-cheat")) { +#ifdef ENABLE_CHEATS + game_cheat1 = 1; /* unlimited ammo */ + game_cheat2 = 1; /* never die */ + game_lives = 6; + game_bombs = 6; + game_bullets = 6; +#endif + } else { sysarg_fail("invalid argument(s)");