rnd-20070907-1-src

diff --git a/src/conftime.h b/src/conftime.h
index 734d44bb3276caf553196f580100d1f08b7fccf6..83befca2ceb6598cbe61e9943b850f669ca8dda5 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "2007-09-04 00:51"
+#define COMPILE_DATE_STRING "2007-09-06 23:38"

diff --git a/src/screens.c b/src/screens.c
index 13a094e4382515427a99860c28d2e02fa962466e..e4e8236e655e6331de9ffc144a1d267ee41fd658 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -756,7 +756,7 @@ static void InitializeTitleControls(boolean show_title_initial)
 {
   num_title_screens = 0;
 
-#if 0
+#if 1
   if (show_title_initial)
     InitializeTitleControls_CheckTitleInfo(TRUE);
 #endif

diff --git a/src/tools.c b/src/tools.c
index c0d20d549539de195fcaa79c31bac8813111b0b3..d950959c53d4e723912185e7a23f32ff4b22c9df 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -4796,6 +4796,24 @@ em_object_mapping_list[] =
     Xsand_stonein_4,                   FALSE,  TRUE,
     EL_ROCK,                           ACTION_FILLING, -1
   },
+#if 1
+  {
+    Xsand_stonesand_1,                 FALSE,  FALSE,
+    EL_QUICKSAND_EMPTYING,             -1, -1
+  },
+  {
+    Xsand_stonesand_2,                 FALSE,  FALSE,
+    EL_QUICKSAND_EMPTYING,             -1, -1
+  },
+  {
+    Xsand_stonesand_3,                 FALSE,  FALSE,
+    EL_QUICKSAND_EMPTYING,             -1, -1
+  },
+  {
+    Xsand_stonesand_4,                 FALSE,  FALSE,
+    EL_QUICKSAND_EMPTYING,             -1, -1
+  },
+#else
   {
     Xsand_stonesand_1,                 FALSE,  FALSE,
     EL_QUICKSAND_FULL,                 -1, -1
@@ -4812,6 +4830,7 @@ em_object_mapping_list[] =
     Xsand_stonesand_4,                 FALSE,  FALSE,
     EL_QUICKSAND_FULL,                 -1, -1
   },
+#endif
   {
     Xsand_stoneout_1,                  FALSE,  FALSE,
     EL_ROCK,                           ACTION_EMPTYING, -1
@@ -4820,6 +4839,24 @@ em_object_mapping_list[] =
     Xsand_stoneout_2,                  FALSE,  FALSE,
     EL_ROCK,                           ACTION_EMPTYING, -1
   },
+#if 1
+  {
+    Xsand_sandstone_1,                 FALSE,  FALSE,
+    EL_QUICKSAND_FILLING,              -1, -1
+  },
+  {
+    Xsand_sandstone_2,                 FALSE,  FALSE,
+    EL_QUICKSAND_FILLING,              -1, -1
+  },
+  {
+    Xsand_sandstone_3,                 FALSE,  FALSE,
+    EL_QUICKSAND_FILLING,              -1, -1
+  },
+  {
+    Xsand_sandstone_4,                 FALSE,  FALSE,
+    EL_QUICKSAND_FILLING,              -1, -1
+  },
+#else
   {
     Xsand_sandstone_1,                 FALSE,  FALSE,
     EL_QUICKSAND_FULL,                 -1, -1
@@ -4836,6 +4873,7 @@ em_object_mapping_list[] =
     Xsand_sandstone_4,                 FALSE,  FALSE,
     EL_QUICKSAND_FULL,                 -1, -1
   },
+#endif
   {
     Xplant,                            TRUE,   FALSE,
     EL_EMC_PLANT,                      -1, -1
@@ -5985,6 +6023,8 @@ inline static boolean check_linear_animation_EM(int tile)
 {
   switch (tile)
   {
+    case Xsand_stonesand_1:
+    case Xsand_sandstone_1:
     case Xboom_1:
     case Xdynamite_1:
     case Ybug_w_n: