From 46c5d03b337f538c20380ebe975bc4609eb1d542 Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Fri, 7 Sep 2007 01:17:38 +0200 Subject: [PATCH] rnd-20070907-1-src --- src/conftime.h | 2 +- src/screens.c | 2 +- src/tools.c | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/src/conftime.h b/src/conftime.h index 734d44bb..83befca2 100644 --- 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 13a094e4..e4e8236e 100644 --- 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 c0d20d54..d950959c 100644 --- 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: -- 2.34.1