From: Holger Schemel <info@artsoft.org>
Date: Thu, 21 Aug 2003 21:07:05 +0000 (+0200)
Subject: rnd-20030821-2-src
X-Git-Tag: 3.0.2^2~2
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=cd2e7117917e6fda0cffd50acabc71ac4e2672ce;hp=2c3e90cdbd6923993994d4128bc8bb1b7ad7ba25;p=rocksndiamonds.git

rnd-20030821-2-src
---

diff --git a/src/conftime.h b/src/conftime.h
index 0bbfa4c1..ff367cc1 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2003-08-21 03:01]"
+#define COMPILE_DATE_STRING "[2003-08-21 23:04]"
diff --git a/src/game.c b/src/game.c
index 1aef43ab..1c86acb0 100644
--- a/src/game.c
+++ b/src/game.c
@@ -5310,7 +5310,8 @@ static void ChangeActiveTrap(int x, int y)
 
 static void ChangeElementNowExt(int x, int y, int target_element)
 {
-#if 0	/* !!! let the player exacpe from a suddenly unaccessible element */
+#if 1
+  /* check if the new element is unaccessible for the player */
   if (IS_PLAYER(x, y) && !IS_ACCESSIBLE(target_element))
   {
     Bang(x, y);
@@ -6341,6 +6342,10 @@ boolean MoveFigureOneStep(struct PlayerInfo *player,
   if (can_move != MF_MOVING)
     return can_move;
 
+  /* check if DigField() has caused relocation of the player */
+  if (player->jx != jx || player->jy != jy)
+    return MF_NO_ACTION;
+
   StorePlayer[jx][jy] = 0;
   player->last_jx = jx;
   player->last_jy = jy;