From: Holger Schemel <info@artsoft.org>
Date: Sat, 8 May 2004 09:31:20 +0000 (+0200)
Subject: rnd-20040508-1-src
X-Git-Tag: 3.1.0^2~6
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=f7e9f2d30ab1cb38b2adef4898fdaf2d254af65b;p=rocksndiamonds.git

rnd-20040508-1-src
---

diff --git a/src/conftime.h b/src/conftime.h
index c351f23f..5ee9111f 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2004-05-06 01:36]"
+#define COMPILE_DATE_STRING "[2004-05-08 01:48]"
diff --git a/src/game.c b/src/game.c
index 9b0a14b9..7496d0e0 100644
--- a/src/game.c
+++ b/src/game.c
@@ -9817,7 +9817,11 @@ void ScrollPlayer(struct PlayerInfo *player, int mode)
       TestIfHeroTouchesBadThing(jx, jy);
       TestIfPlayerTouchesCustomElement(jx, jy);
 #if 1
-      TestIfElementTouchesCustomElement(jx, jy);	/* for empty space */
+#if 1
+      /* needed because pushed element has not yet reached its destination */
+      if (!player->is_pushing)
+#endif
+	TestIfElementTouchesCustomElement(jx, jy);	/* for empty space */
 #endif
 
       if (!player->active)
diff --git a/src/main.h b/src/main.h
index 0c793a0b..3fe5c72c 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1255,7 +1255,7 @@
 #define PROGRAM_VERSION_MAJOR	3
 #define PROGRAM_VERSION_MINOR	1
 #define PROGRAM_VERSION_PATCH	0
-#define PROGRAM_VERSION_BUILD	4
+#define PROGRAM_VERSION_BUILD	5
 
 #define PROGRAM_TITLE_STRING	"Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING	"Holger Schemel"