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 0bbd3b47e6df3e308bf0190e7f67a92184a65f23..c70b2195edd4dc70753f57e2292eabd92c1b7aa6 100644 (file)
--- 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 9d961e76ba4fb729977d519af3f76837b62b87e6..adb97f7e097f13575fb860eda332c7f94bd5a5a6 100644 (file)
--- 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 76a9952991770243f7d206eb143d2a11d11adea9..7e5350234b25ac6bffbcd0e09fceaa3460a89954 100644 (file)
--- 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)