X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=a86507f36d90a642d2ec542963ac98bcba55f91c;hb=b21faa39ac22e1987db2bc6158374388e0090dfe;hp=c835a73464436b25413e488f65f2226819d0a8af;hpb=2c2b1d42b803d35d9f55ce68bf1339dcde6f158a;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index c835a734..a86507f3 100644
--- a/src/files.c
+++ b/src/files.c
@@ -99,18 +99,48 @@ static void setLevelInfoToDefaults()
   {
     int element = EL_CUSTOM_START + i;
 
+    element_info[element].use_template = FALSE;
+
     element_info[element].use_gfx_element = FALSE;
     element_info[element].gfx_element = EL_EMPTY_SPACE;
-    element_info[element].move_pattern = MV_NO_MOVING;
+
+    element_info[element].score = 0;
+    element_info[element].gem_count = 0;
+
+    element_info[element].push_delay_fixed = 2;		/* special default */
+    element_info[element].push_delay_random = 8;	/* special default */
+    element_info[element].move_delay_fixed = 0;
+    element_info[element].move_delay_random = 0;
+
+    element_info[element].move_pattern = MV_ALL_DIRECTIONS;
+    element_info[element].move_direction_initial = MV_NO_MOVING;
+    element_info[element].move_stepsize = TILEX / 8;
 
     for(x=0; x<3; x++)
       for(y=0; y<3; y++)
 	element_info[element].content[x][y] = EL_EMPTY_SPACE;
 
     element_info[element].change.events = CE_BITMASK_DEFAULT;
+
     element_info[element].change.delay_fixed = 0;
     element_info[element].change.delay_random = 0;
-    element_info[element].change.successor = EL_EMPTY_SPACE;
+    element_info[element].change.delay_frames = -1;	/* use default */
+
+    element_info[element].change.trigger = EL_EMPTY_SPACE;
+
+    element_info[element].change.target_element = EL_EMPTY_SPACE;
+
+    element_info[element].change.use_content = FALSE;
+    element_info[element].change.only_complete = FALSE;
+    element_info[element].change.use_random_change = FALSE;
+    element_info[element].change.random = 0;
+    element_info[element].change.power = CP_NON_DESTRUCTIVE;
+
+    element_info[element].change.explode = FALSE;
+
+    for(x=0; x<3; x++)
+      for(y=0; y<3; y++)
+	element_info[element].change.content[x][y] = EL_EMPTY_SPACE;
 
     /* start with no properties at all */
     for (j=0; j < NUM_EP_BITFIELDS; j++)
@@ -377,10 +407,10 @@ static int LoadLevel_CUS2(FILE *file, int chunk_size, struct LevelInfo *level)
   for (i=0; i < num_changed_custom_elements; i++)
   {
     int element = getFile16BitBE(file);
-    int custom_element_successor = getFile16BitBE(file);
+    int custom_target_element = getFile16BitBE(file);
 
     if (IS_CUSTOM_ELEMENT(element))
-      element_info[element].change.successor = custom_element_successor;
+      element_info[element].change.target_element = custom_target_element;
     else
       Error(ERR_WARN, "invalid custom element number %d", element);
   }
@@ -770,12 +800,12 @@ static void SaveLevel_CUS2(FILE *file, struct LevelInfo *level,
   {
     int element = EL_CUSTOM_START + i;
 
-    if (element_info[element].change.successor != EL_EMPTY_SPACE)
+    if (element_info[element].change.target_element != EL_EMPTY_SPACE)
     {
       if (check < num_changed_custom_elements)
       {
 	putFile16BitBE(file, element);
-	putFile16BitBE(file, element_info[element].change.successor);
+	putFile16BitBE(file, element_info[element].change.target_element);
       }
 
       check++;
@@ -783,7 +813,7 @@ static void SaveLevel_CUS2(FILE *file, struct LevelInfo *level,
   }
 
   if (check != num_changed_custom_elements)	/* should not happen */
-    Error(ERR_WARN, "inconsistent number of custom element successors");
+    Error(ERR_WARN, "inconsistent number of custom target elements");
 }
 
 void SaveLevel(int level_nr)
@@ -835,7 +865,7 @@ void SaveLevel(int level_nr)
 
   /* check for non-standard custom elements and calculate "CUS2" chunk size */
   for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
-    if (element_info[EL_CUSTOM_START + i].change.successor != EL_EMPTY_SPACE)
+    if (element_info[EL_CUSTOM_START + i].change.target_element != EL_EMPTY)
       num_changed_custom_elements2++;
 
   putFileChunkBE(file, "RND1", CHUNK_SIZE_UNDEFINED);
@@ -1206,6 +1236,10 @@ void LoadTapeFromFilename(char *filename)
   fclose(file);
 
   tape.length_seconds = GetTapeLength();
+
+#if 0
+  printf("tape version: %d\n", tape.game_version);
+#endif
 }
 
 void LoadTape(int level_nr)
@@ -1927,16 +1961,19 @@ void LoadSpecialMenuDesignSettings()
   if ((setup_file_hash = loadSetupFileHash(filename)) == NULL)
     return;
 
-  /* special case: initialize with default values that may be overwrittem */
+  /* special case: initialize with default values that may be overwritten */
   for (i=0; i < NUM_SPECIAL_GFX_ARGS; i++)
   {
     char *value_x = getHashEntry(setup_file_hash, "menu.draw_xoffset");
     char *value_y = getHashEntry(setup_file_hash, "menu.draw_yoffset");
+    char *list_size = getHashEntry(setup_file_hash, "menu.list_size");
 
     if (value_x != NULL)
       menu.draw_xoffset[i] = get_integer_from_string(value_x);
     if (value_y != NULL)
       menu.draw_yoffset[i] = get_integer_from_string(value_y);
+    if (list_size != NULL)
+      menu.list_size[i] = get_integer_from_string(list_size);
   }
 
   /* read (and overwrite with) values that may be specified in config file */