From: Holger Schemel <info@artsoft.org>
Date: Wed, 15 Jun 2005 08:15:35 +0000 (+0200)
Subject: rnd-20050615-1-src
X-Git-Tag: 3.1.1^2~9
X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=b3e0a0c203fa30406e03ac1c86be49bfb3abc0e7

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 6c1e666b..80790f89 100644
--- 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 3a27e147..0ba409df 100644
--- 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 7e1aae73..eb58f0c3 100644
--- 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;
 }