miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

XRick: reverted falling speed. fixed physics for MOVE_UP platforms

Browse Source
This commit is contained in:
Sergii Pylypenko
2014-06-19 19:51:42 +03:00
parent c3d19bb025
commit f848fb6af0
5 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
project/jni/application/xrick/AndroidAppSettings.cfg
View File

@@ -7,10 +7,10 @@ AppName="XRick"
AppFullName=net.xrick.sdl
# Application version code (integer)
AppVersionCode=102121207
AppVersionCode=102121208
# Application user-visible version name (string)
AppVersionName="021212.07"
AppVersionName="021212.08"
# 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

1
project/jni/application/xrick/xrick-021212/include/system.h
View File

@@ -141,6 +141,7 @@ extern void syssnd_free(sound_t *);
extern int sysarg_args_period;
extern int sysarg_args_map;
extern int sysarg_args_submap;
extern int sysarg_args_submap_commandline_override;
extern int sysarg_args_fullscreen;
extern int sysarg_args_zoom;
#ifdef ENABLE_SOUND

4
project/jni/application/xrick/xrick-021212/src/e_rick.c
View File

@@ -193,7 +193,7 @@ e_rick_action2(void)
return;
}
/* fall */
offsy += (offsy > 0) ? 0x0040 : 0x0080;
offsy += 0x0080;
if (offsy > 0x0800) {
offsy = 0x0800;
ylow = 0;
@@ -230,7 +230,7 @@ e_rick_action2(void)
u_envtest(x, E_RICK_ENT.y, E_RICK_STTST(E_RICK_STCRAWL), &env0, &env1);
/* save x-position if it is possible to move */
if (!(env1 & (MAP_EFLG_SOLID|MAP_EFLG_SPAD|MAP_EFLG_WAYUP))) {
if (!(env1 & (MAP_EFLG_SOLID|MAP_EFLG_SPAD/*|MAP_EFLG_WAYUP*/))) {
E_RICK_ENT.x = x;
if (env1 & MAP_EFLG_LETHAL) e_rick_gozombie();
}

6
project/jni/application/xrick/xrick-021212/src/maps.c
View File

@@ -230,8 +230,10 @@ void map_restoreProgress(void)
return;
fscanf(ff, "%d %d", &map, &submap);
fclose(ff);
sysarg_args_map = map;
sysarg_args_submap = submap;
if (!sysarg_args_submap_commandline_override) {
sysarg_args_map = map;
sysarg_args_submap = submap;
}
}

2
project/jni/application/xrick/xrick-021212/src/sysarg.c
View File

@@ -44,6 +44,7 @@ static sdlcodes_t sdlcodes[SDLK_LAST] = {
int sysarg_args_period = 0;
int sysarg_args_map = 0;
int sysarg_args_submap = 0;
int sysarg_args_submap_commandline_override = 0;
int sysarg_args_fullscreen = 0;
int sysarg_args_zoom = 0;
int sysarg_args_nosound = 0;
@@ -186,6 +187,7 @@ sysarg_init(int argc, char **argv)
sysarg_args_submap = atoi(argv[i]) - 1;
if (sysarg_args_submap < 0 || sysarg_args_submap >= MAP_NBR_SUBMAPS)
sysarg_fail("invalid submap number");
sysarg_args_submap_commandline_override = 1;
}
#ifdef ENABLE_SOUND
else if (!strcmp(argv[i], "-vol")) {