From: Holger Schemel <info@artsoft.org>
Date: Fri, 24 Jun 2005 06:46:57 +0000 (+0200)
Subject: rnd-20050624-1-src
X-Git-Tag: 3.1.1^2~8
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=486d880026ce50d4e4d3a3b78a9e72db2b09d755;p=rocksndiamonds.git

rnd-20050624-1-src
---

diff --git a/src/conftime.h b/src/conftime.h
index 0ba409df..1e306b0f 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2005-06-15 02:22]"
+#define COMPILE_DATE_STRING "[2005-06-16 20:25]"
diff --git a/src/game.c b/src/game.c
index eb58f0c3..a383c690 100644
--- a/src/game.c
+++ b/src/game.c
@@ -3393,7 +3393,11 @@ void Explode(int ex, int ey, int phase, int mode)
 	continue;
 #endif
 
-#if 1
+      /* no idea why this was changed from 3.0.8 to 3.1.0 -- this causes buggy
+	 behaviour, for example when touching a yamyam that explodes to rocks
+	 with active deadly shield, a rock is created under the player !!! */
+      /* (case 1 (surely buggy): >= 3.1.0, case 2 (maybe buggy): <= 3.0.8) */
+#if 0
       if (IS_PLAYER(x, y) && SHIELD_ON(PLAYERINFO(x, y)) &&
 	  (game.engine_version < VERSION_IDENT(3,1,0,0) ||
 	   (x == ex && y == ey && mode != EX_TYPE_BORDER)))
diff --git a/src/tape.c b/src/tape.c
index acb05d86..172af415 100644
--- a/src/tape.c
+++ b/src/tape.c
@@ -1339,6 +1339,7 @@ void AutoPlayTape()
 	printf(" %03d", i);
   }
 
+#if 0
   if (num_tape_missing > 0)
   {
     printf(", NO TAPE:");
@@ -1346,6 +1347,7 @@ void AutoPlayTape()
       if (tape_missing[i])
 	printf(" %03d", i);
   }
+#endif
 
   printf("\n");
   printf_line("=", 79);