X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=8fe110f24254cece6bd2d43f606229d665c35da3;hb=4096fcbae692bfbf2f6506786659872a60b31693;hp=6a9cb746b8b30e05de07b06957190e84f65f1b5a;hpb=5f9fbeb32ecd4c70ed6d6df8809719af619b40c0;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 6a9cb746..8fe110f2 100644
--- a/src/files.c
+++ b/src/files.c
@@ -27,12 +27,16 @@
 #define CHUNK_SIZE_NONE		-1	/* do not write chunk size    */
 #define FILE_VERS_CHUNK_SIZE	8	/* size of file version chunk */
 #define LEVEL_HEADER_SIZE	80	/* size of level file header  */
-#define LEVEL_HEADER_UNUSED	14	/* unused level header bytes  */
+#define LEVEL_HEADER_UNUSED	13	/* unused level header bytes  */
 #define LEVEL_CHUNK_CNT2_SIZE	160	/* size of level CNT2 chunk   */
 #define LEVEL_CHUNK_CNT2_UNUSED	11	/* unused CNT2 chunk bytes    */
+#define LEVEL_CPART_CUS3_SIZE	134	/* size of CUS3 chunk part    */
+#define LEVEL_CPART_CUS3_UNUSED	15	/* unused CUS3 bytes / part   */
 #define TAPE_HEADER_SIZE	20	/* size of tape file header   */
 #define TAPE_HEADER_UNUSED	3	/* unused tape header bytes   */
 
+#define LEVEL_CHUNK_CUS3_SIZE(x) (2 + x * LEVEL_CPART_CUS3_SIZE)
+
 /* file identifier strings */
 #define LEVEL_COOKIE_TMPL	"ROCKSNDIAMONDS_LEVEL_FILE_VERSION_x.x"
 #define TAPE_COOKIE_TMPL	"ROCKSNDIAMONDS_TAPE_FILE_VERSION_x.x"
@@ -73,6 +77,8 @@ static void setLevelInfoToDefaults()
   level.gravity = FALSE;
   level.em_slippery_gems = FALSE;
 
+  level.use_custom_template = FALSE;
+
   for(i=0; i<MAX_LEVEL_NAME_LEN; i++)
     level.name[i] = '\0';
   for(i=0; i<MAX_LEVEL_AUTHOR_LEN; i++)
@@ -99,18 +105,69 @@ static void setLevelInfoToDefaults()
   {
     int element = EL_CUSTOM_START + i;
 
-    level.custom_element[i].use_gfx_element = FALSE;
-    level.custom_element[i].gfx_element = EL_EMPTY_SPACE;
-    level.custom_element[i].move_direction = 0;
+    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,
+	      element_info[element].custom_description, MAX_ELEMENT_NAME_LEN);
+    else
+      strcpy(element_info[element].description,
+	     element_info[element].editor_description);
+
+    element_info[element].use_gfx_element = FALSE;
+    element_info[element].gfx_element = EL_EMPTY_SPACE;
+
+    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;
+
+    element_info[element].slippery_type = SLIPPERY_ANY_RANDOM;
 
     for(x=0; x<3; x++)
       for(y=0; y<3; y++)
-	level.custom_element[i].content[x][y] = EL_EMPTY_SPACE;
+	element_info[element].content[x][y] = EL_EMPTY_SPACE;
 
-    level.custom_element[i].change.events = CE_BITMASK_DEFAULT;
-    level.custom_element[i].change.delay_fixed = 0;
-    level.custom_element[i].change.delay_random = 0;
-    level.custom_element[i].change.successor = 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;
 
     /* start with no properties at all */
     for (j=0; j < NUM_EP_BITFIELDS; j++)
@@ -210,6 +267,8 @@ static int LoadLevel_HEAD(FILE *file, int chunk_size, struct LevelInfo *level)
   level->encoding_16bit_field	= (fgetc(file) == 1 ? TRUE : FALSE);
   level->em_slippery_gems	= (fgetc(file) == 1 ? TRUE : FALSE);
 
+  level->use_custom_template	= (fgetc(file) == 1 ? TRUE : FALSE);
+
   ReadUnusedBytesFromFile(file, LEVEL_HEADER_UNUSED);
 
   return chunk_size;
@@ -377,11 +436,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 i = element - EL_CUSTOM_START;
+    int custom_target_element = getFile16BitBE(file);
 
     if (IS_CUSTOM_ELEMENT(element))
-      level->custom_element[i].change.successor = custom_element_successor;
+      element_info[element].change.target_element = custom_target_element;
     else
       Error(ERR_WARN, "invalid custom element number %d", element);
   }
@@ -389,6 +447,93 @@ static int LoadLevel_CUS2(FILE *file, int chunk_size, struct LevelInfo *level)
   return chunk_size;
 }
 
+static int LoadLevel_CUS3(FILE *file, int chunk_size, struct LevelInfo *level)
+{
+  int num_changed_custom_elements = getFile16BitBE(file);
+  int chunk_size_expected = LEVEL_CHUNK_CUS3_SIZE(num_changed_custom_elements);
+  int i, j, x, y;
+
+  if (chunk_size_expected != chunk_size)
+  {
+    ReadUnusedBytesFromFile(file, chunk_size - 2);
+    return chunk_size_expected;
+  }
+
+  for (i=0; i < num_changed_custom_elements; i++)
+  {
+    int element = getFile16BitBE(file);
+
+    if (!IS_CUSTOM_ELEMENT(element))
+    {
+      Error(ERR_WARN, "invalid custom element number %d", element);
+
+      element = EL_DEFAULT;	/* dummy element used for artwork config */
+    }
+
+    for(j=0; j<MAX_ELEMENT_NAME_LEN; j++)
+      element_info[element].description[j] = getFile8Bit(file);
+    element_info[element].description[MAX_ELEMENT_NAME_LEN] = 0;
+
+    Properties[element][EP_BITFIELD_BASE] = getFile32BitBE(file);
+
+    /* some free bytes for future properties and padding */
+    ReadUnusedBytesFromFile(file, 7);
+
+    element_info[element].use_gfx_element = getFile8Bit(file);
+    element_info[element].gfx_element =
+      checkLevelElement(getFile16BitBE(file));
+
+    element_info[element].score = getFile8Bit(file);
+    element_info[element].gem_count = getFile8Bit(file);
+
+    element_info[element].push_delay_fixed = getFile16BitBE(file);
+    element_info[element].push_delay_random = getFile16BitBE(file);
+    element_info[element].move_delay_fixed = getFile16BitBE(file);
+    element_info[element].move_delay_random = getFile16BitBE(file);
+
+    element_info[element].move_pattern = getFile16BitBE(file);
+    element_info[element].move_direction_initial = getFile8Bit(file);
+    element_info[element].move_stepsize = getFile8Bit(file);
+
+    for(y=0; y<3; y++)
+      for(x=0; x<3; x++)
+	element_info[element].content[x][y] =
+	  checkLevelElement(getFile16BitBE(file));
+
+    element_info[element].change.events = getFile32BitBE(file);
+
+    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.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.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] =
+	  checkLevelElement(getFile16BitBE(file));
+
+    element_info[element].slippery_type = getFile8Bit(file);
+
+    /* some free bytes for future properties and padding */
+    ReadUnusedBytesFromFile(file, LEVEL_CPART_CUS3_UNUSED);
+  }
+
+  return chunk_size;
+}
+
 void LoadLevelFromFilename(char *filename)
 {
   char cookie[MAX_LINE_LEN];
@@ -469,6 +614,7 @@ void LoadLevelFromFilename(char *filename)
       { "CNT2", LEVEL_CHUNK_CNT2_SIZE,	LoadLevel_CNT2 },
       { "CUS1", -1,			LoadLevel_CUS1 },
       { "CUS2", -1,			LoadLevel_CUS2 },
+      { "CUS3", -1,			LoadLevel_CUS3 },
       {  NULL,  0,			NULL }
     };
 
@@ -639,6 +785,8 @@ static void SaveLevel_HEAD(FILE *file, struct LevelInfo *level)
   fputc((level->encoding_16bit_field ? 1 : 0), file);
   fputc((level->em_slippery_gems ? 1 : 0), file);
 
+  fputc((level->use_custom_template ? 1 : 0), file);
+
   WriteUnusedBytesToFile(file, LEVEL_HEADER_UNUSED);
 }
 
@@ -733,6 +881,7 @@ static void SaveLevel_CNT2(FILE *file, struct LevelInfo *level, int element)
 	putFile16BitBE(file, content_array[i][x][y]);
 }
 
+#if 0
 static void SaveLevel_CUS1(FILE *file, struct LevelInfo *level,
 			   int num_changed_custom_elements)
 {
@@ -759,7 +908,9 @@ static void SaveLevel_CUS1(FILE *file, struct LevelInfo *level,
   if (check != num_changed_custom_elements)	/* should not happen */
     Error(ERR_WARN, "inconsistent number of custom element properties");
 }
+#endif
 
+#if 0
 static void SaveLevel_CUS2(FILE *file, struct LevelInfo *level,
 			   int num_changed_custom_elements)
 {
@@ -771,12 +922,12 @@ static void SaveLevel_CUS2(FILE *file, struct LevelInfo *level,
   {
     int element = EL_CUSTOM_START + i;
 
-    if (level->custom_element[i].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, level->custom_element[i].change.successor);
+	putFile16BitBE(file, element_info[element].change.target_element);
       }
 
       check++;
@@ -784,15 +935,96 @@ 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");
+}
+#endif
+
+static void SaveLevel_CUS3(FILE *file, struct LevelInfo *level,
+			   int num_changed_custom_elements)
+{
+  int i, j, x, y, check = 0;
+
+  putFile16BitBE(file, num_changed_custom_elements);
+
+  for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
+  {
+    int element = EL_CUSTOM_START + i;
+
+    if (Properties[element][EP_BITFIELD_BASE] != EP_BITMASK_DEFAULT)
+    {
+      if (check < num_changed_custom_elements)
+      {
+	putFile16BitBE(file, element);
+
+	for(j=0; j<MAX_ELEMENT_NAME_LEN; j++)
+	  putFile8Bit(file, element_info[element].description[j]);
+
+	putFile32BitBE(file, Properties[element][EP_BITFIELD_BASE]);
+
+	/* some free bytes for future properties and padding */
+	WriteUnusedBytesToFile(file, 7);
+
+	putFile8Bit(file, element_info[element].use_gfx_element);
+	putFile16BitBE(file, element_info[element].gfx_element);
+
+	putFile8Bit(file, element_info[element].score);
+	putFile8Bit(file, element_info[element].gem_count);
+
+	putFile16BitBE(file, element_info[element].push_delay_fixed);
+	putFile16BitBE(file, element_info[element].push_delay_random);
+	putFile16BitBE(file, element_info[element].move_delay_fixed);
+	putFile16BitBE(file, element_info[element].move_delay_random);
+
+	putFile16BitBE(file, element_info[element].move_pattern);
+	putFile8Bit(file, element_info[element].move_direction_initial);
+	putFile8Bit(file, element_info[element].move_stepsize);
+
+	for(y=0; y<3; y++)
+	  for(x=0; x<3; x++)
+	    putFile16BitBE(file, element_info[element].content[x][y]);
+
+	putFile32BitBE(file, element_info[element].change.events);
+
+	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.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.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]);
+
+	putFile8Bit(file, element_info[element].slippery_type);
+
+	/* some free bytes for future properties and padding */
+	WriteUnusedBytesToFile(file, LEVEL_CPART_CUS3_UNUSED);
+      }
+
+      check++;
+    }
+  }
+
+  if (check != num_changed_custom_elements)	/* should not happen */
+    Error(ERR_WARN, "inconsistent number of custom element properties");
 }
 
 void SaveLevel(int level_nr)
 {
   char *filename = getLevelFilename(level_nr);
   int body_chunk_size;
-  int num_changed_custom_elements1 = 0;
-  int num_changed_custom_elements2 = 0;
+  int num_changed_custom_elements = 0;
+  int level_chunk_CUS3_size;
   int i, x, y;
   FILE *file;
 
@@ -829,15 +1061,11 @@ void SaveLevel(int level_nr)
   body_chunk_size =
     level.fieldx * level.fieldy * (level.encoding_16bit_field ? 2 : 1);
 
-  /* check for non-standard custom elements and calculate "CUS1" chunk size */
+  /* check for non-standard custom elements and calculate "CUS3" chunk size */
   for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
     if (Properties[EL_CUSTOM_START +i][EP_BITFIELD_BASE] != EP_BITMASK_DEFAULT)
-      num_changed_custom_elements1++;
-
-  /* check for non-standard custom elements and calculate "CUS2" chunk size */
-  for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
-    if (level.custom_element[i].change.successor != EL_EMPTY_SPACE)
-      num_changed_custom_elements2++;
+      num_changed_custom_elements++;
+  level_chunk_CUS3_size = LEVEL_CHUNK_CUS3_SIZE(num_changed_custom_elements);
 
   putFileChunkBE(file, "RND1", CHUNK_SIZE_UNDEFINED);
   putFileChunkBE(file, "CAVE", CHUNK_SIZE_NONE);
@@ -867,16 +1095,10 @@ void SaveLevel(int level_nr)
     SaveLevel_CNT2(file, &level, EL_BD_AMOEBA);
   }
 
-  if (num_changed_custom_elements1 > 0)
-  {
-    putFileChunkBE(file, "CUS1", 2 + num_changed_custom_elements1 * 6);
-    SaveLevel_CUS1(file, &level, num_changed_custom_elements1);
-  }
-
-  if (num_changed_custom_elements2 > 0)
+  if (num_changed_custom_elements > 0)
   {
-    putFileChunkBE(file, "CUS2", 2 + num_changed_custom_elements2 * 4);
-    SaveLevel_CUS2(file, &level, num_changed_custom_elements2);
+    putFileChunkBE(file, "CUS3", level_chunk_CUS3_size);
+    SaveLevel_CUS3(file, &level, num_changed_custom_elements);
   }
 
   fclose(file);
@@ -887,7 +1109,7 @@ void SaveLevel(int level_nr)
 void DumpLevel(struct LevelInfo *level)
 {
   printf_line("-", 79);
-  printf("Level xxx (file version %06d, game version %06d)\n",
+  printf("Level xxx (file version %08d, game version %08d)\n",
 	 level->file_version, level->game_version);
   printf_line("-", 79);
 
@@ -1207,6 +1429,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)
@@ -1344,7 +1570,7 @@ void DumpTape(struct TapeInfo *tape)
   }
 
   printf_line("-", 79);
-  printf("Tape of Level %03d (file version %06d, game version %06d)\n",
+  printf("Tape of Level %03d (file version %08d, game version %08d)\n",
 	 tape->level_nr, tape->file_version, tape->game_version);
   printf("Level series identifier: '%s'\n", tape->level_identifier);
   printf_line("-", 79);
@@ -1928,16 +2154,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 */