From: Holger Schemel <info@artsoft.org>
Date: Wed, 30 Jun 2010 22:53:24 +0000 (+0200)
Subject: rnd-20100701-1-src
X-Git-Tag: 3.3.1.0^2~14
X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=9f4e306d9d5c5a7f9c8a3aa0a92e206ad3bc05a2

rnd-20100701-1-src
---

diff --git a/src/conftime.h b/src/conftime.h
index 0d45bca7..33348da5 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "2010-06-30 23:35"
+#define COMPILE_DATE_STRING "2010-07-01 00:52"
diff --git a/src/game.c b/src/game.c
index 5a0a70b7..895c4d32 100644
--- a/src/game.c
+++ b/src/game.c
@@ -4358,8 +4358,8 @@ void InitGame()
 #if 1
   if (TILESIZE_VAR < TILESIZE && EVEN(SCR_FIELDX))
   {
-    // SBX_Left--;
-    SBX_Right++;
+    SBX_Left--;
+    // SBX_Right++;
   }
 #endif
 #endif
diff --git a/src/tools.c b/src/tools.c
index 176b56f6..2d59752b 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -439,6 +439,8 @@ void BackToFront()
 #endif
 
 #else
+
+#if 0
 	ffx = (scroll_x - SBX_Left) * TILEX_VAR + dx * TILESIZE_VAR / TILESIZE;
 
 	if (EVEN(SCR_FIELDX))
@@ -451,6 +453,54 @@ void BackToFront()
 	  printf("::: %d (%d, %d) [%d] [%d] => %d\n",
 		 ffx, SBX_Left * TILEX_VAR, SBX_Right * TILEX_VAR, dx, FX, fx);
 	}
+#else
+
+#if 0
+	ffx = (scroll_x - SBX_Left) * TILEX_VAR + dx * TILESIZE_VAR / TILESIZE;
+
+	if (EVEN(SCR_FIELDX))
+	{
+	  if (ffx < SBX_Right * TILEX_VAR + TILEX_VAR / 2 + 0 * TILEX_VAR / 2)
+	  {
+	    fx = fx + dx * TILESIZE_VAR / TILESIZE - MIN(ffx, TILEX_VAR / 2) +
+	      1 * TILEX_VAR;
+	  }
+	  else
+	  {
+	    fx = fx - (dx <= 0 ? TILEX_VAR : 0) + 1 * TILEX_VAR;
+
+	    printf("::: STOPPED\n");
+	  }
+
+	  printf("::: %d (%d, %d) [%d] [%d] => %d\n",
+		 ffx, SBX_Left * TILEX_VAR, SBX_Right * TILEX_VAR, dx, FX, fx);
+	}
+#else
+	/* !!! THIS WORKS !!! */
+
+	ffx = (scroll_x - SBX_Left) * TILEX_VAR + dx * TILESIZE_VAR / TILESIZE;
+
+	if (EVEN(SCR_FIELDX))
+	{
+	  if (ffx < SBX_Right * TILEX_VAR + TILEX_VAR / 2 + 2 * TILEX_VAR / 2)
+	  {
+	    fx = fx + dx * TILESIZE_VAR / TILESIZE - MIN(ffx, TILEX_VAR / 2) +
+	      1 * TILEX_VAR;
+	  }
+	  else
+	  {
+	    fx = fx - (dx <= 0 ? TILEX_VAR : 0) + 1 * TILEX_VAR;
+
+	    printf("::: STOPPED\n");
+	  }
+
+	  printf("::: %d (%d, %d) [%d] [%d] => %d\n",
+		 ffx, SBX_Left * TILEX_VAR, SBX_Right * TILEX_VAR, dx, FX, fx);
+	}
+#endif
+
+#endif
+
 #endif
 
 #if 0