X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffiles.c;h=e17ef526412bcca6ec178c60922d4d50dacdb657;hb=945d51a5966241e4964a2b72058b6295cbc4a688;hp=d9840486bf81bbf77fb0641882c2cbbf23eb7fe5;hpb=274935f49f49068998ad7b4ed9d93892aedfc6aa;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index d9840486..e17ef526 100644
--- a/src/files.c
+++ b/src/files.c
@@ -47,54 +47,6 @@
 /* level file functions                                                      */
 /* ========================================================================= */
 
-void setElementChangePages(struct ElementInfo *ei, int change_pages)
-{
-  int change_page_size = sizeof(struct ElementChangeInfo);
-
-  ei->num_change_pages = MAX(1, change_pages);
-
-  ei->change_page =
-    checked_realloc(ei->change_page, ei->num_change_pages * change_page_size);
-
-  if (ei->current_change_page >= ei->num_change_pages)
-    ei->current_change_page = ei->num_change_pages - 1;
-
-  ei->change = &ei->change_page[ei->current_change_page];
-}
-
-void setElementChangeInfoToDefaults(struct ElementChangeInfo *eci)
-{
-  int x, y;
-
-  eci->events = CE_BITMASK_DEFAULT;
-  eci->target_element = EL_EMPTY_SPACE;
-
-  eci->delay_fixed = 0;
-  eci->delay_random = 0;
-  eci->delay_frames = -1;	/* later set to reliable default value */
-
-  eci->trigger_element = EL_EMPTY_SPACE;
-
-  eci->explode = FALSE;
-  eci->use_content = FALSE;
-  eci->only_complete = FALSE;
-  eci->use_random_change = FALSE;
-  eci->random = 0;
-  eci->power = CP_NON_DESTRUCTIVE;
-
-  for(x=0; x<3; x++)
-    for(y=0; y<3; y++)
-      eci->content[x][y] = EL_EMPTY_SPACE;
-
-  eci->player_action = 0;
-  eci->collide_action = 0;
-  eci->other_action = 0;
-
-  eci->pre_change_function = NULL;
-  eci->change_function = NULL;
-  eci->post_change_function = NULL;
-}
-
 static void setLevelInfoToDefaults(struct LevelInfo *level)
 {
   int i, j, x, y;
@@ -135,10 +87,6 @@ static void setLevelInfoToDefaults(struct LevelInfo *level)
   strcpy(level->name, NAMELESS_LEVEL_NAME);
   strcpy(level->author, ANONYMOUS_NAME);
 
-  level->envelope[0] = '\0';
-  level->envelope_xsize = MAX_ENVELOPE_XSIZE;
-  level->envelope_ysize = MAX_ENVELOPE_YSIZE;
-
   for(i=0; i<LEVEL_SCORE_ELEMENTS; i++)
     level->score[i] = 10;
 
@@ -152,17 +100,11 @@ static void setLevelInfoToDefaults(struct LevelInfo *level)
   level->field[0][0] = EL_PLAYER_1;
   level->field[STD_LEV_FIELDX - 1][STD_LEV_FIELDY - 1] = EL_EXIT_CLOSED;
 
-  for (i=0; i < MAX_NUM_ELEMENTS; i++)
-  {
-    setElementChangePages(&element_info[i], 1);
-    setElementChangeInfoToDefaults(element_info[i].change);
-  }
-
   for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
   {
     int element = EL_CUSTOM_START + i;
 
-    for(j=0; j < MAX_ELEMENT_NAME_LEN + 1; j++)
+    for(j=0; j<MAX_ELEMENT_NAME_LEN + 1; j++)
       element_info[element].description[j] = '\0';
     if (element_info[element].custom_description != NULL)
       strncpy(element_info[element].description,
@@ -192,19 +134,40 @@ static void setLevelInfoToDefaults(struct LevelInfo *level)
       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.target_element = EL_EMPTY_SPACE;
+
+    element_info[element].change.delay_fixed = 0;
+    element_info[element].change.delay_random = 0;
+    element_info[element].change.delay_frames = -1;	/* use default */
+
+    element_info[element].change.trigger_element = EL_EMPTY_SPACE;
+
+    element_info[element].change.explode = FALSE;
+    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;
+
+    for(x=0; x<3; x++)
+      for(y=0; y<3; y++)
+	element_info[element].change.content[x][y] = EL_EMPTY_SPACE;
+
     element_info[element].access_type = 0;
     element_info[element].access_layer = 0;
     element_info[element].walk_to_action = 0;
     element_info[element].smash_targets = 0;
     element_info[element].deadliness = 0;
     element_info[element].consistency = 0;
+    element_info[element].change_player_action = 0;
+    element_info[element].change_collide_action = 0;
+    element_info[element].change_other_action = 0;
 
     element_info[element].can_explode_by_fire = FALSE;
     element_info[element].can_explode_smashed = FALSE;
     element_info[element].can_explode_impact = FALSE;
 
-    element_info[element].current_change_page = 0;
-
     /* start with no properties at all */
     for (j=0; j < NUM_EP_BITFIELDS; j++)
       Properties[element][j] = EP_BITMASK_DEFAULT;
@@ -491,7 +454,7 @@ static int LoadLevel_CUS2(FILE *file, int chunk_size, struct LevelInfo *level)
     int custom_target_element = getFile16BitBE(file);
 
     if (IS_CUSTOM_ELEMENT(element))
-      element_info[element].change->target_element = custom_target_element;
+      element_info[element].change.target_element = custom_target_element;
     else
       Error(ERR_WARN, "invalid custom element number %d", element);
   }
@@ -552,29 +515,29 @@ static int LoadLevel_CUS3(FILE *file, int chunk_size, struct LevelInfo *level)
 	element_info[element].content[x][y] =
 	  checkLevelElement(getFile16BitBE(file));
 
-    element_info[element].change->events = getFile32BitBE(file);
+    element_info[element].change.events = getFile32BitBE(file);
 
-    element_info[element].change->target_element =
+    element_info[element].change.target_element =
       checkLevelElement(getFile16BitBE(file));
 
-    element_info[element].change->delay_fixed = getFile16BitBE(file);
-    element_info[element].change->delay_random = getFile16BitBE(file);
-    element_info[element].change->delay_frames = getFile16BitBE(file);
+    element_info[element].change.delay_fixed = getFile16BitBE(file);
+    element_info[element].change.delay_random = getFile16BitBE(file);
+    element_info[element].change.delay_frames = getFile16BitBE(file);
 
-    element_info[element].change->trigger_element =
+    element_info[element].change.trigger_element =
       checkLevelElement(getFile16BitBE(file));
 
-    element_info[element].change->explode = getFile8Bit(file);
-    element_info[element].change->use_content = getFile8Bit(file);
-    element_info[element].change->only_complete = getFile8Bit(file);
-    element_info[element].change->use_random_change = getFile8Bit(file);
+    element_info[element].change.explode = getFile8Bit(file);
+    element_info[element].change.use_content = getFile8Bit(file);
+    element_info[element].change.only_complete = getFile8Bit(file);
+    element_info[element].change.use_random_change = getFile8Bit(file);
 
-    element_info[element].change->random = getFile8Bit(file);
-    element_info[element].change->power = getFile8Bit(file);
+    element_info[element].change.random = getFile8Bit(file);
+    element_info[element].change.power = getFile8Bit(file);
 
     for(y=0; y<3; y++)
       for(x=0; x<3; x++)
-	element_info[element].change->content[x][y] =
+	element_info[element].change.content[x][y] =
 	  checkLevelElement(getFile16BitBE(file));
 
     element_info[element].slippery_type = getFile8Bit(file);
@@ -1052,12 +1015,12 @@ static void SaveLevel_CUS2(FILE *file, struct LevelInfo *level,
   {
     int element = EL_CUSTOM_START + i;
 
-    if (element_info[element].change->target_element != 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->target_element);
+	putFile16BitBE(file, element_info[element].change.target_element);
       }
 
       check++;
@@ -1113,27 +1076,27 @@ static void SaveLevel_CUS3(FILE *file, struct LevelInfo *level,
 	  for(x=0; x<3; x++)
 	    putFile16BitBE(file, element_info[element].content[x][y]);
 
-	putFile32BitBE(file, element_info[element].change->events);
+	putFile32BitBE(file, element_info[element].change.events);
 
-	putFile16BitBE(file, element_info[element].change->target_element);
+	putFile16BitBE(file, element_info[element].change.target_element);
 
-	putFile16BitBE(file, element_info[element].change->delay_fixed);
-	putFile16BitBE(file, element_info[element].change->delay_random);
-	putFile16BitBE(file, element_info[element].change->delay_frames);
+	putFile16BitBE(file, element_info[element].change.delay_fixed);
+	putFile16BitBE(file, element_info[element].change.delay_random);
+	putFile16BitBE(file, element_info[element].change.delay_frames);
 
-	putFile16BitBE(file, element_info[element].change->trigger_element);
+	putFile16BitBE(file, element_info[element].change.trigger_element);
 
-	putFile8Bit(file, element_info[element].change->explode);
-	putFile8Bit(file, element_info[element].change->use_content);
-	putFile8Bit(file, element_info[element].change->only_complete);
-	putFile8Bit(file, element_info[element].change->use_random_change);
+	putFile8Bit(file, element_info[element].change.explode);
+	putFile8Bit(file, element_info[element].change.use_content);
+	putFile8Bit(file, element_info[element].change.only_complete);
+	putFile8Bit(file, element_info[element].change.use_random_change);
 
-	putFile8Bit(file, element_info[element].change->random);
-	putFile8Bit(file, element_info[element].change->power);
+	putFile8Bit(file, element_info[element].change.random);
+	putFile8Bit(file, element_info[element].change.power);
 
 	for(y=0; y<3; y++)
 	  for(x=0; x<3; x++)
-	    putFile16BitBE(file, element_info[element].change->content[x][y]);
+	    putFile16BitBE(file, element_info[element].change.content[x][y]);
 
 	putFile8Bit(file, element_info[element].slippery_type);