changed initializing CE properties to older versions (code cleanup)

[rocksndiamonds.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index a803819762d3daca9157ef986524a5e7d32a2480..c60e08b45e80f88a623775853928bd937adbcd45 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -6452,6 +6452,20 @@ static void LoadLevel_InitCustomElements(struct LevelInfo *level)
       }
     }
   }
+
+  /* set some other uninitialized values of custom elements in older levels */
+  if (level->game_version < VERSION_IDENT(3,1,0,0))
+  {
+    for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++)
+    {
+      int element = EL_CUSTOM_START + i;
+
+      element_info[element].access_direction = MV_ALL_DIRECTIONS;
+
+      element_info[element].explosion_delay = 17;
+      element_info[element].ignition_delay = 8;
+    }
+  }
 }
 
 static void LoadLevel_InitElements(struct LevelInfo *level, char *filename)
@@ -6461,9 +6475,6 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename)
   if (level->file_has_custom_elements)
     LoadLevel_InitCustomElements(level);
 
-  if (level->file_has_custom_elements)
-    InitElementPropertiesAfterLoading(level->game_version);
-
   /* initialize element properties for level editor etc. */
   InitElementPropertiesEngine(level->game_version);
   InitElementPropertiesGfxElement();