From f848fb6af061077b8d2156f5625e6d1be82b4a67 Mon Sep 17 00:00:00 2001
From: Sergii Pylypenko <x.pelya.x@gmail.com>
Date: Thu, 19 Jun 2014 19:51:42 +0300
Subject: [PATCH] XRick: reverted falling speed. fixed physics for MOVE_UP
 platforms

---
 project/jni/application/xrick/AndroidAppSettings.cfg        | 4 ++--
 project/jni/application/xrick/xrick-021212/include/system.h | 1 +
 project/jni/application/xrick/xrick-021212/src/e_rick.c     | 4 ++--
 project/jni/application/xrick/xrick-021212/src/maps.c       | 6 ++++--
 project/jni/application/xrick/xrick-021212/src/sysarg.c     | 2 ++
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/project/jni/application/xrick/AndroidAppSettings.cfg b/project/jni/application/xrick/AndroidAppSettings.cfg
index c19155367..4ad9fff8a 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=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
diff --git a/project/jni/application/xrick/xrick-021212/include/system.h b/project/jni/application/xrick/xrick-021212/include/system.h
index 6382c842a..bfda38c0c 100644
--- a/project/jni/application/xrick/xrick-021212/include/system.h
+++ b/project/jni/application/xrick/xrick-021212/include/system.h
@@ -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
diff --git a/project/jni/application/xrick/xrick-021212/src/e_rick.c b/project/jni/application/xrick/xrick-021212/src/e_rick.c
index 72c469c45..a51e6b0e9 100644
--- a/project/jni/application/xrick/xrick-021212/src/e_rick.c
+++ b/project/jni/application/xrick/xrick-021212/src/e_rick.c
@@ -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();
 	}
diff --git a/project/jni/application/xrick/xrick-021212/src/maps.c b/project/jni/application/xrick/xrick-021212/src/maps.c
index 8f3f818b6..4e321d8b9 100644
--- a/project/jni/application/xrick/xrick-021212/src/maps.c
+++ b/project/jni/application/xrick/xrick-021212/src/maps.c
@@ -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;
+	}
 }
 
 
diff --git a/project/jni/application/xrick/xrick-021212/src/sysarg.c b/project/jni/application/xrick/xrick-021212/src/sysarg.c
index 6cf1a5f04..75b01dbe7 100644
--- a/project/jni/application/xrick/xrick-021212/src/sysarg.c
+++ b/project/jni/application/xrick/xrick-021212/src/sysarg.c
@@ -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")) {