From: Holger Schemel <info@artsoft.org>
Date: Fri, 2 Dec 2005 20:04:36 +0000 (+0100)
Subject: rnd-20051202-2-src
X-Git-Tag: 3.1.2^2~40
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=05be30e0b291803b5d1947ad04ff4c3be546ed4a;p=rocksndiamonds.git

rnd-20051202-2-src
---

diff --git a/src/conftime.h b/src/conftime.h
index 4809d999..75edfffa 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2005-12-02 19:50]"
+#define COMPILE_DATE_STRING "[2005-12-02 20:36]"
diff --git a/src/game.c b/src/game.c
index 1d2230b3..a78e341f 100644
--- a/src/game.c
+++ b/src/game.c
@@ -25,13 +25,13 @@
 #define USE_NEW_AMOEBA_CODE	FALSE
 
 /* EXPERIMENTAL STUFF */
-#define USE_NEW_STUFF			(TRUE				* 1)
+#define USE_NEW_STUFF			(			* 1)
 
-#define USE_NEW_SP_SLIPPERY		(TRUE	* USE_NEW_STUFF		* 1)
-#define USE_NEW_COLLECT_COUNT		(TRUE	* USE_NEW_STUFF		* 1)
-#define USE_NEW_PLAYER_ANIM		(TRUE	* USE_NEW_STUFF		* 1)
-#define USE_NEW_ALL_SLIPPERY		(TRUE	* USE_NEW_STUFF		* 1)
-#define USE_NEW_PLAYER_SPEED		(TRUE	* USE_NEW_STUFF		* 1)
+#define USE_NEW_SP_SLIPPERY		(USE_NEW_STUFF		* 1)
+#define USE_NEW_COLLECT_COUNT		(USE_NEW_STUFF		* 1)
+#define USE_NEW_PLAYER_ANIM		(USE_NEW_STUFF		* 1)
+#define USE_NEW_ALL_SLIPPERY		(USE_NEW_STUFF		* 1)
+#define USE_NEW_PLAYER_SPEED		(USE_NEW_STUFF		* 1)
 
 
 /* for DigField() */
@@ -1725,8 +1725,7 @@ void InitGame()
 	element_info[i].slippery_type = SLIPPERY_ANY_LEFT_RIGHT;
 
       /* BD style elements prefer to slip down on the left side */
-      if (i == EL_BD_ROCK || i == EL_BD_DIAMOND ||
-	  game.emulation == EMU_BOULDERDASH)
+      if (game.emulation == EMU_BOULDERDASH)
 	element_info[i].slippery_type = SLIPPERY_ANY_LEFT_RIGHT;
     }
   }
@@ -4840,7 +4839,11 @@ void StartMoving(int x, int y)
 #if USE_NEW_ALL_SLIPPERY
       if (can_fall_both)
       {
-	can_fall_left = !(can_fall_right = RND(2));
+	if (element == EL_BD_ROCK || element == EL_BD_DIAMOND)
+	  can_fall_right = FALSE;	/* slip down on left side */
+	else
+	  can_fall_left = !(can_fall_right = RND(2));
+
 	can_fall_both = FALSE;
       }
 #else