From: Holger Schemel <info@artsoft.org>
Date: Wed, 31 Oct 2007 20:18:37 +0000 (+0100)
Subject: rnd-20071031-1-src
X-Git-Tag: 3.2.6.0^2~25
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=ed9b77daec8c9dbddc04f08c6f2de24135415e44;p=rocksndiamonds.git

rnd-20071031-1-src
* fixed bug in new "can dig" feature (see below) so that an unsuccessful
  try to push something (due to push delay) does not cause a dig action
---

diff --git a/ChangeLog b/ChangeLog
index 0bbd3b47..c70b2195 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-31
+	* fixed bug in new "can dig" feature (see below) so that an unsuccessful
+	  try to push something (due to push delay) does not cause a dig action
+
 2007-10-29
 	* fixed bug with reference elements used as trigger elements on custom
 	  element change pages not being recognized
diff --git a/src/conftime.h b/src/conftime.h
index 9d961e76..adb97f7e 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "2007-10-30 01:13"
+#define COMPILE_DATE_STRING "2007-10-31 20:50"
diff --git a/src/game.c b/src/game.c
index 76a99529..7e535023 100644
--- a/src/game.c
+++ b/src/game.c
@@ -14534,13 +14534,6 @@ static int DigField(struct PlayerInfo *player,
 	    CUSTOM_ELEMENT_CAN_ENTER_FIELD(element, nextx, nexty)))))
       return MP_NO_ACTION;
 
-    if (IS_CUSTOM_ELEMENT(element) &&
-	CUSTOM_ELEMENT_CAN_ENTER_FIELD(element, nextx, nexty))
-    {
-      if (!DigFieldByCE(nextx, nexty, element))
-	return MP_NO_ACTION;
-    }
-
     if (!checkDiagonalPushing(player, x, y, real_dx, real_dy))
       return MP_NO_ACTION;
 
@@ -14558,6 +14551,13 @@ static int DigField(struct PlayerInfo *player,
       return MP_NO_ACTION;
     }
 
+    if (IS_CUSTOM_ELEMENT(element) &&
+	CUSTOM_ELEMENT_CAN_ENTER_FIELD(element, nextx, nexty))
+    {
+      if (!DigFieldByCE(nextx, nexty, element))
+	return MP_NO_ACTION;
+    }
+
     if (IS_SB_ELEMENT(element))
     {
       if (element == EL_SOKOBAN_FIELD_FULL)