changed initializing CE properties to older versions (code cleanup)

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();

diff --git a/src/init.c b/src/init.c
index c6b6d0d31ce04236f853ef6559c1bf47ebe8772f..4bde60f91115bb361ca862c91a67bab34e164d78 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -4683,25 +4683,6 @@ void InitElementPropertiesEngine(int engine_version)
     InitElementGraphicInfo();
 }
 
-void InitElementPropertiesAfterLoading(int engine_version)
-{
-  int i;
-
-  /* set some other uninitialized values of custom elements in older levels */
-  if (engine_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;
-    }
-  }
-}
-
 void InitElementPropertiesGfxElement()
 {
   int i;

diff --git a/src/init.h b/src/init.h
index ab14b75de2e7e623d67396172e24f8ab7e3e1405..bd4ba9c13f1cd1c57667604f70caff3e3a1ae74c 100644 (file)
--- a/src/init.h
+++ b/src/init.h
@@ -33,7 +33,6 @@ boolean getBitfieldProperty(int *, int, int);
 void ResolveGroupElement(int);
 void InitElementPropertiesStatic(void);
 void InitElementPropertiesEngine(int);
-void InitElementPropertiesAfterLoading(int);
 void InitElementPropertiesGfxElement();
 
 void ReloadCustomArtwork(int);