rnd-20050615-1-src

* fixed graphical bug which caused the player (being Murphy) to show
  collecting animations although the element was collected by penguin

diff --git a/ChangeLog b/ChangeLog
index 6c1e666b616898f633d0af50ceb6a92f2b18c7f3..80790f89f2e4c1cafdbdb7907296e1c4c7fbc11b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-14
+       * fixed graphical bug which caused the player (being Murphy) to show
+         collecting animations although the element was collected by penguin
+
 2005-06-08
        * fixed two bugs causing wrong door background graphics in system.c
          (in functions "SetBackgroundBitmap()" and "DrawingOnBackground()")

diff --git a/src/conftime.h b/src/conftime.h
index 3a27e147bd3ea34ff7370d2a376207a8769f4d67..0ba409dfe7a9483d92b4becc3fe7747fad85c4f1 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2005-06-08 02:17]"
+#define COMPILE_DATE_STRING "[2005-06-15 02:22]"

diff --git a/src/game.c b/src/game.c
index 7e1aae7345c742eefdc1cb8d50430a8aca76d3fa..eb58f0c36b96bbd369d0b3d246244e54b1c05a69 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -47,6 +47,8 @@
 #define USE_GRAVITY_BUGFIX_NEW (TRUE   * USE_NEW_STUFF         * 1)
 #define USE_GRAVITY_BUGFIX_OLD (TRUE   * USE_NEW_STUFF         * 0)
 
+#define USE_PENGUIN_COLLECT_BUG        (TRUE   * USE_NEW_STUFF         * 1)
+
 
 /* for DigField() */
 #define DF_NO_PUSH             0
@@ -12185,8 +12187,13 @@ int DigField(struct PlayerInfo *player,
   player->push_delay = 0;
 #endif
 
-  if (Feld[x][y] != element)           /* really digged/collected something */
-    player->is_collecting = !player->is_digging;
+#if USE_PENGUIN_COLLECT_BUG
+  if (is_player)               /* function can also be called by EL_PENGUIN */
+#endif
+  {
+    if (Feld[x][y] != element)         /* really digged/collected something */
+      player->is_collecting = !player->is_digging;
+  }
 
   return MF_MOVING;
 }