rocksndiamonds-3.1.2

[rocksndiamonds.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index d522761ce9127dc3e3291d299c2d23e66fd638b3..93ab6bc8e1b564612179ae24109ec3be17b2684c 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -114,11 +114,6 @@ void setElementChangeInfoToDefaults(struct ElementChangeInfo *change)
   change->random_percentage = 100;
   change->replace_when = CP_WHEN_EMPTY;
 
-  change->use_change_action = FALSE;
-  change->change_action = CA_NO_ACTION;
-  change->change_action_mode = CA_MODE_UNDEFINED;
-  change->change_action_arg = CA_ARG_UNDEFINED;
-
   for (x = 0; x < 3; x++)
     for (y = 0; y < 3; y++)
       change->target_content[x][y] = EL_EMPTY_SPACE;
@@ -298,9 +293,6 @@ static void setLevelInfoToDefaults(struct LevelInfo *level)
       element_info[element].explosion_delay = 16;
       element_info[element].ignition_delay = 8;
 
-      element_info[element].counter_initial = 0;
-      element_info[element].counter = 0;
-
       for (x = 0; x < 3; x++)
        for (y = 0; y < 3; y++)
          element_info[element].content[x][y] = EL_EMPTY_SPACE;
@@ -2768,23 +2760,20 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename)
   }
 
   /* correct custom element values (for old levels without these options) */
-  if (level->game_version < VERSION_IDENT(3,1,1,0))
+  for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++)
   {
-    for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++)
-    {
-      int element = EL_CUSTOM_START + i;
-      struct ElementInfo *ei = &element_info[element];
+    int element = EL_CUSTOM_START + i;
+    struct ElementInfo *ei = &element_info[element];
 
-      if (ei->access_direction == MV_NO_MOVING)
-       ei->access_direction = MV_ALL_DIRECTIONS;
+    if (ei->access_direction == MV_NO_MOVING)
+      ei->access_direction = MV_ALL_DIRECTIONS;
 
-      for (j = 0; j < ei->num_change_pages; j++)
-      {
-       struct ElementChangeInfo *change = &ei->change_page[j];
+    for (j = 0; j < ei->num_change_pages; j++)
+    {
+      struct ElementChangeInfo *change = &ei->change_page[j];
 
-       if (change->trigger_side == CH_SIDE_NONE)
-         change->trigger_side = CH_SIDE_ANY;
-      }
+      if (change->trigger_side == CH_SIDE_NONE)
+       change->trigger_side = CH_SIDE_ANY;
     }
   }