X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=c721a4cd734808cc3cdf4b6fbb8f1a8269fc26a8;hb=c9bb6e0a6eecbf84320be79b121bd957a938a08c;hp=4f1b196dea116e6f95b9f656e82692f6ea33fba9;hpb=d5224fde97c235c903f631a4eccb9904c2ddf9c3;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 4f1b196d..c721a4cd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -27,8 +27,8 @@ Bitmap		       *bitmap_db_field, *bitmap_db_door;
 #if 0
 Pixmap			tile_clipmask[NUM_TILES];
 #endif
-DrawBuffer	     *fieldbuffer;
-DrawBuffer	     *drawto_field;
+DrawBuffer	       *fieldbuffer;
+DrawBuffer	       *drawto_field;
 
 int			game_status = -1;
 boolean			level_editor_test_game = FALSE;
@@ -44,6 +44,7 @@ short			Ur[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			MovPos[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			MovDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			MovDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short			ChangeDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			Store[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			Store2[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			StorePlayer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@ -2796,6 +2797,11 @@ struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
     "-",
     "-"
   },
+  {
+    "diamond_breaking",
+    "-",
+    "-"
+  },
   {
     "acid_splash_left",
     "-",
@@ -2931,6 +2937,26 @@ struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
     "-",
     "-"
   },
+  {
+    "[default]",
+    "default",
+    "-"
+  },
+  {
+    "[bd_default]",
+    "bd_default",
+    "-"
+  },
+  {
+    "[sp_default]",
+    "sp_default",
+    "-"
+  },
+  {
+    "[sb_default]",
+    "sb_default",
+    "-"
+  },
 
   /* keyword to stop parser: "ELEMENT_INFO_END" <-- do not change! */
 
@@ -3005,6 +3031,7 @@ struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1] =
 struct TokenIntPtrInfo image_config_vars[] =
 {
   { "global.num_toons",		&global.num_toons			   },
+
   { "menu.draw_xoffset",	&menu.draw_xoffset_default		   },
   { "menu.draw_yoffset",	&menu.draw_yoffset_default		   },
   { "menu.draw_xoffset.MAIN",	&menu.draw_xoffset[GFX_SPECIAL_ARG_MAIN]   },
@@ -3019,6 +3046,12 @@ struct TokenIntPtrInfo image_config_vars[] =
   { "menu.draw_yoffset.INFO",	&menu.draw_yoffset[GFX_SPECIAL_ARG_INFO]   },
   { "menu.draw_xoffset.SETUP",	&menu.draw_xoffset[GFX_SPECIAL_ARG_SETUP]  },
   { "menu.draw_yoffset.SETUP",	&menu.draw_yoffset[GFX_SPECIAL_ARG_SETUP]  },
+
+  { "menu.list_size",		&menu.list_size_default			   },
+  { "menu.list_size.LEVELS",	&menu.list_size[GFX_SPECIAL_ARG_LEVELS]	   },
+  { "menu.list_size.SCORES",	&menu.list_size[GFX_SPECIAL_ARG_SCORES]	   },
+  { "menu.list_size.INFO",	&menu.list_size[GFX_SPECIAL_ARG_INFO]	   },
+
   { "door.step_offset",		&door.step_offset			   },
   { "door.step_delay",		&door.step_delay			   },