X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=25bdd22b41086c82189de274f0d9cc67782c00a7;hb=e05e97eef55da1c82b493d0ca20a868e8e189413;hp=1d48c5d8ac4759147b5a0414f668358aafb242cd;hpb=38ea4e57bc9b730abf7a15f8cc235465e6f0ad4c;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 1d48c5d8..25bdd22b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,7 +1,7 @@
 /***********************************************************
 * Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-* (c) 1995-2002 Artsoft Entertainment                      *
+* (c) 1995-2006 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
@@ -20,7 +20,7 @@
 #include "events.h"
 #include "config.h"
 
-Bitmap		       *bitmap_db_title;
+Bitmap		       *bitmap_db_cross;
 Bitmap		       *bitmap_db_field;
 Bitmap		       *bitmap_db_panel;
 Bitmap		       *bitmap_db_door;
@@ -68,10 +68,6 @@ short			ExplodeDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 int			RunnerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 int			PlayerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 
-#if 0
-unsigned long		Properties[MAX_NUM_ELEMENTS][NUM_EP_BITFIELDS];
-#endif
-
 int			GfxFrame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 int 			GfxRandom[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 int 			GfxElement[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@ -3699,43 +3695,43 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "growing wall (horizontal, BD style)"
   },
   {
-    "last_ce_8",
-    "last_ce",
+    "prev_ce_8",
+    "prev_ce",
     "CE 8 positions earlier in list"
   },
   {
-    "last_ce_7",
-    "last_ce",
+    "prev_ce_7",
+    "prev_ce",
     "CE 7 positions earlier in list"
   },
   {
-    "last_ce_6",
-    "last_ce",
+    "prev_ce_6",
+    "prev_ce",
     "CE 6 positions earlier in list"
   },
   {
-    "last_ce_5",
-    "last_ce",
+    "prev_ce_5",
+    "prev_ce",
     "CE 5 positions earlier in list"
   },
   {
-    "last_ce_4",
-    "last_ce",
+    "prev_ce_4",
+    "prev_ce",
     "CE 4 positions earlier in list"
   },
   {
-    "last_ce_3",
-    "last_ce",
+    "prev_ce_3",
+    "prev_ce",
     "CE 3 positions earlier in list"
   },
   {
-    "last_ce_2",
-    "last_ce",
+    "prev_ce_2",
+    "prev_ce",
     "CE 2 positions earlier in list"
   },
   {
-    "last_ce_1",
-    "last_ce",
+    "prev_ce_1",
+    "prev_ce",
     "CE 1 position earlier in list"
   },
   {
@@ -4664,6 +4660,9 @@ struct TokenIntPtrInfo image_config_vars[] =
   { "menu.list_size.SCORES",	&menu.list_size[GFX_SPECIAL_ARG_SCORES]	    },
   { "menu.list_size.INFO",	&menu.list_size[GFX_SPECIAL_ARG_INFO]	    },
 
+  { "menu.fade_delay",		&menu.fade_delay			    },
+  { "menu.post_delay",		&menu.post_delay			    },
+
   { "door_1.width",		&door_1.width				    },
   { "door_1.height",		&door_1.height				    },
   { "door_1.step_offset",	&door_1.step_offset			    },