rnd-20040508-1-src

diff --git a/src/conftime.h b/src/conftime.h
index c351f23fd475c44a5e1f6a007f49cb7d24b6ba23..5ee9111f0af599d140d9fbd8c3f830040e47a101 100644 (file)
--- 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 9b0a14b952bb008ad10b4d9bc364ffda646bc902..7496d0e08d361623b10304508097e0dd21238ea8 100644 (file)
--- 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 0c793a0b468f093234f6e655ef9cb7f76b085960..3fe5c72cc3b0abf95bb50157864c66761eae4ec5 100644 (file)
--- 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"