rnd-20020317-1-src

diff --git a/CHANGES b/CHANGES
index 50ac3be8ae744aadb9b8cd741e6ef9319061199a..e7de4f1a1468d072aef968c68b6d4f6747e241f4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,7 @@ Release Version 2.0.1 [?? ??? 2002]
          (needed for quite some Emerald Mine Club levels)
        - icon for Windows executable added
        - bug when selecting default level series fixed
+       - new IFF style file format for level and tape files
        - bug in storing amoeba content fixed
        - nasty tape bugs fixed (completely reworked tape stuff)
        - fullscreen mode now works with Windows (workaround for bug in SDL)

diff --git a/src/files.c b/src/files.c
index 3f50b5e9da42d312637589df1fd4dd84a5f8065c..260c41a706707cf2bf1a7f07e26db30b36f42696 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -22,15 +22,18 @@
 #include "tape.h"
 #include "joystick.h"
 
-#define MAX_FILENAME_LEN       256     /* maximal filename length   */
-#define MAX_LINE_LEN           1000    /* maximal input line length */
-#define CHUNK_ID_LEN           4       /* IFF style chunk id length */
-#define LEVEL_HEADER_SIZE      80      /* size of level file header */
-#define LEVEL_HEADER_UNUSED    15      /* 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 TAPE_HEADER_SIZE       20      /* size of tape file header  */
-#define TAPE_HEADER_UNUSED     7       /* unused tape header bytes  */
+#define MAX_FILENAME_LEN       256     /* maximal filename length    */
+#define MAX_LINE_LEN           1000    /* maximal input line length  */
+#define CHUNK_ID_LEN           4       /* IFF style chunk id length  */
+#define CHUNK_SIZE_UNDEFINED   0       /* undefined chunk size == 0  */
+#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    15      /* 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 TAPE_HEADER_SIZE       20      /* size of tape file header   */
+#define TAPE_HEADER_UNUSED     7       /* unused tape header bytes   */
 
 /* file identifier strings */
 #define LEVEL_COOKIE           "ROCKSNDIAMONDS_LEVEL_FILE_VERSION_2.0"
@@ -192,53 +195,6 @@ char *levelclass_desc[NUM_LEVELCLASS_DESC] =
                         IS_LEVELCLASS_USER(n) ?                7 : \
                         9)
 
-static int getFileVersionFromCookieString(const char *cookie)
-{
-  const char *ptr_cookie1, *ptr_cookie2;
-  const char *pattern1 = "_FILE_VERSION_";
-  const char *pattern2 = "?.?";
-  const int len_cookie = strlen(cookie);
-  const int len_pattern1 = strlen(pattern1);
-  const int len_pattern2 = strlen(pattern2);
-  const int len_pattern = len_pattern1 + len_pattern2;
-  int version_major, version_minor;
-
-  if (len_cookie <= len_pattern)
-    return -1;
-
-  ptr_cookie1 = &cookie[len_cookie - len_pattern];
-  ptr_cookie2 = &cookie[len_cookie - len_pattern2];
-
-  if (strncmp(ptr_cookie1, pattern1, len_pattern1) != 0)
-    return -1;
-
-  if (ptr_cookie2[0] < '0' || ptr_cookie2[0] > '9' ||
-      ptr_cookie2[1] != '.' ||
-      ptr_cookie2[2] < '0' || ptr_cookie2[2] > '9')
-    return -1;
-
-  version_major = ptr_cookie2[0] - '0';
-  version_minor = ptr_cookie2[2] - '0';
-
-  return (version_major * 10 + version_minor);
-}
-
-boolean checkCookieString(const char *cookie, const char *template)
-{
-  const char *pattern = "_FILE_VERSION_?.?";
-  const int len_cookie = strlen(cookie);
-  const int len_template = strlen(template);
-  const int len_pattern = strlen(pattern);
-
-  if (len_cookie != len_template)
-    return FALSE;
-
-  if (strncmp(cookie, template, len_cookie - len_pattern) != 0)
-    return FALSE;
-
-  return TRUE;
-}
-
 char *getLevelClassDescription(struct LevelDirInfo *ldi)
 {
   int position = ldi->sort_priority / 100;
@@ -403,6 +359,109 @@ static void InitLevelSetupDirectory(char *level_subdir)
   createDirectory(getLevelSetupDir(level_subdir), "level setup");
 }
 
+static void ReadUnusedBytesFromFile(FILE *file, unsigned long bytes)
+{
+  while (bytes--)
+    fgetc(file);
+}
+
+static void WriteUnusedBytesToFile(FILE *file, unsigned long bytes)
+{
+  while (bytes--)
+    fputc(0, file);
+}
+
+static void ReadChunk_VERS(FILE *file, int *file_version, int *game_version)
+{
+  int file_version_major, file_version_minor, file_version_patch;
+  int game_version_major, game_version_minor, game_version_patch;
+
+  file_version_major = fgetc(file);
+  file_version_minor = fgetc(file);
+  file_version_patch = fgetc(file);
+  fgetc(file);         /* not used */
+
+  game_version_major = fgetc(file);
+  game_version_minor = fgetc(file);
+  game_version_patch = fgetc(file);
+  fgetc(file);         /* not used */
+
+  *file_version = VERSION_IDENT(file_version_major,
+                               file_version_minor,
+                               file_version_patch);
+
+  *game_version = VERSION_IDENT(game_version_major,
+                               game_version_minor,
+                               game_version_patch);
+}
+
+static void WriteChunk_VERS(FILE *file, int file_version, int game_version)
+{
+  int file_version_major = VERSION_MAJOR(file_version);
+  int file_version_minor = VERSION_MINOR(file_version);
+  int file_version_patch = VERSION_PATCH(file_version);
+  int game_version_major = VERSION_MAJOR(game_version);
+  int game_version_minor = VERSION_MINOR(game_version);
+  int game_version_patch = VERSION_PATCH(game_version);
+
+  fputc(file_version_major, file);
+  fputc(file_version_minor, file);
+  fputc(file_version_patch, file);
+  fputc(0, file);      /* not used */
+
+  fputc(game_version_major, file);
+  fputc(game_version_minor, file);
+  fputc(game_version_patch, file);
+  fputc(0, file);      /* not used */
+}
+
+static int getFileVersionFromCookieString(const char *cookie)
+{
+  const char *ptr_cookie1, *ptr_cookie2;
+  const char *pattern1 = "_FILE_VERSION_";
+  const char *pattern2 = "?.?";
+  const int len_cookie = strlen(cookie);
+  const int len_pattern1 = strlen(pattern1);
+  const int len_pattern2 = strlen(pattern2);
+  const int len_pattern = len_pattern1 + len_pattern2;
+  int version_major, version_minor;
+
+  if (len_cookie <= len_pattern)
+    return -1;
+
+  ptr_cookie1 = &cookie[len_cookie - len_pattern];
+  ptr_cookie2 = &cookie[len_cookie - len_pattern2];
+
+  if (strncmp(ptr_cookie1, pattern1, len_pattern1) != 0)
+    return -1;
+
+  if (ptr_cookie2[0] < '0' || ptr_cookie2[0] > '9' ||
+      ptr_cookie2[1] != '.' ||
+      ptr_cookie2[2] < '0' || ptr_cookie2[2] > '9')
+    return -1;
+
+  version_major = ptr_cookie2[0] - '0';
+  version_minor = ptr_cookie2[2] - '0';
+
+  return VERSION_IDENT(version_major, version_minor, 0);
+}
+
+boolean checkCookieString(const char *cookie, const char *template)
+{
+  const char *pattern = "_FILE_VERSION_?.?";
+  const int len_cookie = strlen(cookie);
+  const int len_template = strlen(template);
+  const int len_pattern = strlen(pattern);
+
+  if (len_cookie != len_template)
+    return FALSE;
+
+  if (strncmp(cookie, template, len_cookie - len_pattern) != 0)
+    return FALSE;
+
+  return TRUE;
+}
+
 static void setLevelInfoToDefaults()
 {
   int i, x, y;
@@ -695,19 +754,14 @@ void OLD_LoadLevel(int level_nr)
   SetBorderElement();
 }
 
-static void ReadUnusedBytesFromFile(FILE *file, unsigned long bytes)
+static int LoadLevel_VERS(FILE *file, int chunk_size, struct LevelInfo *level)
 {
-  while (bytes--)
-    fgetc(file);
-}
+  ReadChunk_VERS(file, &(level->file_version), &(level->game_version));
 
-static void WriteUnusedBytesToFile(FILE *file, unsigned long bytes)
-{
-  while (bytes--)
-    fputc(0, file);
+  return chunk_size;
 }
 
-static int LoadLevel_HEAD(struct LevelInfo *level, FILE *file, int chunk_size)
+static int LoadLevel_HEAD(FILE *file, int chunk_size, struct LevelInfo *level)
 {
   int i, x, y;
 
@@ -744,7 +798,7 @@ static int LoadLevel_HEAD(struct LevelInfo *level, FILE *file, int chunk_size)
   return chunk_size;
 }
 
-static int LoadLevel_AUTH(struct LevelInfo *level, FILE *file, int chunk_size)
+static int LoadLevel_AUTH(FILE *file, int chunk_size, struct LevelInfo *level)
 {
   int i;
 
@@ -755,7 +809,7 @@ static int LoadLevel_AUTH(struct LevelInfo *level, FILE *file, int chunk_size)
   return chunk_size;
 }
 
-static int LoadLevel_CONT(struct LevelInfo *level, FILE *file, int chunk_size)
+static int LoadLevel_CONT(FILE *file, int chunk_size, struct LevelInfo *level)
 {
   int i, x, y;
   int header_size = 4;
@@ -796,7 +850,7 @@ static int LoadLevel_CONT(struct LevelInfo *level, FILE *file, int chunk_size)
   return chunk_size;
 }
 
-static int LoadLevel_BODY(struct LevelInfo *level, FILE *file, int chunk_size)
+static int LoadLevel_BODY(FILE *file, int chunk_size, struct LevelInfo *level)
 {
   int x, y;
   int chunk_size_expected = level->fieldx * level->fieldy;
@@ -824,7 +878,7 @@ static int LoadLevel_BODY(struct LevelInfo *level, FILE *file, int chunk_size)
   return chunk_size;
 }
 
-static int LoadLevel_CNT2(struct LevelInfo *level, FILE *file, int chunk_size)
+static int LoadLevel_CNT2(FILE *file, int chunk_size, struct LevelInfo *level)
 {
   int i, x, y;
   int element;
@@ -885,6 +939,7 @@ void LoadLevel(int level_nr)
     return;
   }
 
+#if 0
   /* check file identifier */
   fgets(cookie, MAX_LINE_LEN, file);
   if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n')
@@ -903,12 +958,48 @@ void LoadLevel(int level_nr)
     fclose(file);
     return;
   }
+#else
+  getFileChunk(file, chunk_name, NULL, BYTE_ORDER_BIG_ENDIAN);
+  if (strcmp(chunk_name, "RND1") == 0)
+  {
+    getFile32BitInteger(file, BYTE_ORDER_BIG_ENDIAN);  /* not used */
+
+    getFileChunk(file, chunk_name, NULL, BYTE_ORDER_BIG_ENDIAN);
+    if (strcmp(chunk_name, "CAVE") != 0)
+    {
+      Error(ERR_WARN, "unknown format of level file '%s'", filename);
+      fclose(file);
+      return;
+    }
+  }
+  else /* check for pre-2.0 file format with cookie string */
+  {
+    strcpy(cookie, chunk_name);
+    fgets(&cookie[4], MAX_LINE_LEN - 4, file);
+    if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n')
+      cookie[strlen(cookie) - 1] = '\0';
+
+    if (!checkCookieString(cookie, LEVEL_COOKIE)) /* unknown file format */
+    {
+      Error(ERR_WARN, "unknown format of level file '%s'", filename);
+      fclose(file);
+      return;
+    }
+
+    if ((level.file_version = getFileVersionFromCookieString(cookie)) == -1)
+    {
+      Error(ERR_WARN, "unsupported version of level file '%s'", filename);
+      fclose(file);
+      return;
+    }
+  }
+#endif
 
   if (level.file_version < FILE_VERSION_1_2)
   {
     /* level files from versions before 1.2.0 without chunk structure */
-    LoadLevel_HEAD(&level, file, LEVEL_HEADER_SIZE);
-    LoadLevel_BODY(&level, file, level.fieldx * level.fieldy);
+    LoadLevel_HEAD(file, LEVEL_HEADER_SIZE,           &level);
+    LoadLevel_BODY(file, level.fieldx * level.fieldy, &level);
   }
   else
   {
@@ -916,10 +1007,11 @@ void LoadLevel(int level_nr)
     {
       char *name;
       int size;
-      int (*loader)(struct LevelInfo *, FILE *, int);
+      int (*loader)(FILE *, int, struct LevelInfo *);
     }
     chunk_info[] =
     {
+      { "VERS", FILE_VERS_CHUNK_SIZE,  LoadLevel_VERS },
       { "HEAD", LEVEL_HEADER_SIZE,     LoadLevel_HEAD },
       { "AUTH", MAX_LEVEL_AUTHOR_LEN,  LoadLevel_AUTH },
       { "CONT", -1,                    LoadLevel_CONT },
@@ -953,7 +1045,7 @@ void LoadLevel(int level_nr)
       {
        /* call function to load this level chunk */
        int chunk_size_expected =
-         (chunk_info[i].loader)(&level, file, chunk_size);
+         (chunk_info[i].loader)(file, chunk_size, &level);
 
        /* the size of some chunks cannot be checked before reading other
           chunks first (like "HEAD" and "BODY") that contain some header
@@ -1095,7 +1187,7 @@ void OLD_SaveLevel(int level_nr)
   chmod(filename, LEVEL_PERMS);
 }
 
-static void SaveLevel_HEAD(struct LevelInfo *level, FILE *file)
+static void SaveLevel_HEAD(FILE *file, struct LevelInfo *level)
 {
   int i, x, y;
 
@@ -1130,7 +1222,7 @@ static void SaveLevel_HEAD(struct LevelInfo *level, FILE *file)
   WriteUnusedBytesToFile(file, LEVEL_HEADER_UNUSED);
 }
 
-static void SaveLevel_AUTH(struct LevelInfo *level, FILE *file)
+static void SaveLevel_AUTH(FILE *file, struct LevelInfo *level)
 {
   int i;
 
@@ -1139,7 +1231,7 @@ static void SaveLevel_AUTH(struct LevelInfo *level, FILE *file)
 }
 
 #if 0
-static void SaveLevel_CONT(struct LevelInfo *level, FILE *file)
+static void SaveLevel_CONT(FILE *file, struct LevelInfo *level)
 {
   int i, x, y;
 
@@ -1159,7 +1251,7 @@ static void SaveLevel_CONT(struct LevelInfo *level, FILE *file)
 }
 #endif
 
-static void SaveLevel_BODY(struct LevelInfo *level, FILE *file)
+static void SaveLevel_BODY(FILE *file, struct LevelInfo *level)
 {
   int x, y;
 
@@ -1171,7 +1263,7 @@ static void SaveLevel_BODY(struct LevelInfo *level, FILE *file)
        fputc(Ur[x][y], file);
 }
 
-static void SaveLevel_CNT2(struct LevelInfo *level, FILE *file, int element)
+static void SaveLevel_CNT2(FILE *file, struct LevelInfo *level, int element)
 {
   int i, x, y;
   int num_contents, content_xsize, content_ysize;
@@ -1256,14 +1348,22 @@ void SaveLevel(int level_nr)
   body_chunk_size =
     level.fieldx * level.fieldy * (level.encoding_16bit_field ? 2 : 1);
 
+#if 0
   fputs(LEVEL_COOKIE, file);           /* file identifier */
   fputc('\n', file);
+#else
+  putFileChunk(file, "RND1", CHUNK_SIZE_UNDEFINED, BYTE_ORDER_BIG_ENDIAN);
+  putFileChunk(file, "CAVE", CHUNK_SIZE_NONE,      BYTE_ORDER_BIG_ENDIAN);
+
+  putFileChunk(file, "VERS", FILE_VERS_CHUNK_SIZE, BYTE_ORDER_BIG_ENDIAN);
+  WriteChunk_VERS(file, FILE_VERSION_ACTUAL, GAME_VERSION_ACTUAL);
+#endif
 
   putFileChunk(file, "HEAD", LEVEL_HEADER_SIZE, BYTE_ORDER_BIG_ENDIAN);
-  SaveLevel_HEAD(&level, file);
+  SaveLevel_HEAD(file, &level);
 
   putFileChunk(file, "AUTH", MAX_LEVEL_AUTHOR_LEN, BYTE_ORDER_BIG_ENDIAN);
-  SaveLevel_AUTH(&level, file);
+  SaveLevel_AUTH(file, &level);
 
 #if 0
   if (level.encoding_16bit_field)      /* obsolete since new "CNT2" chunk */
@@ -1271,24 +1371,24 @@ void SaveLevel(int level_nr)
     chunk_size = 4 + 2 * (MAX_ELEMENT_CONTENTS * 3 * 3);
 
     putFileChunk(file, "CONT", chunk_size, BYTE_ORDER_BIG_ENDIAN);
-    SaveLevel_CONT(&level, file);
+    SaveLevel_CONT(file, &level);
   }
 #endif
 
   putFileChunk(file, "BODY", body_chunk_size, BYTE_ORDER_BIG_ENDIAN);
-  SaveLevel_BODY(&level, file);
+  SaveLevel_BODY(file, &level);
 
   if (level.encoding_16bit_yamyam ||
       level.num_yam_contents != STD_ELEMENT_CONTENTS)
   {
     putFileChunk(file, "CNT2", LEVEL_CHUNK_CNT2_SIZE, BYTE_ORDER_BIG_ENDIAN);
-    SaveLevel_CNT2(&level, file, EL_MAMPFER);
+    SaveLevel_CNT2(file, &level, EL_MAMPFER);
   }
 
   if (level.encoding_16bit_amoeba)
   {
     putFileChunk(file, "CNT2", LEVEL_CHUNK_CNT2_SIZE, BYTE_ORDER_BIG_ENDIAN);
-    SaveLevel_CNT2(&level, file, EL_AMOEBE_BD);
+    SaveLevel_CNT2(file, &level, EL_AMOEBE_BD);
   }
 
   fclose(file);
@@ -1532,7 +1632,14 @@ void OLD_LoadTape(int level_nr)
   tape.length_seconds = GetTapeLength();
 }
 
-static int LoadTape_HEAD(struct TapeInfo *tape, FILE *file, int chunk_size)
+static int LoadTape_VERS(FILE *file, int chunk_size, struct TapeInfo *tape)
+{
+  ReadChunk_VERS(file, &(tape->file_version), &(tape->game_version));
+
+  return chunk_size;
+}
+
+static int LoadTape_HEAD(FILE *file, int chunk_size, struct TapeInfo *tape)
 {
   int i;
 
@@ -1564,7 +1671,7 @@ static int LoadTape_HEAD(struct TapeInfo *tape, FILE *file, int chunk_size)
   return chunk_size;
 }
 
-static int LoadTape_BODY(struct TapeInfo *tape, FILE *file, int chunk_size)
+static int LoadTape_BODY(FILE *file, int chunk_size, struct TapeInfo *tape)
 {
   int i, j;
   int chunk_size_expected =
@@ -1660,6 +1767,7 @@ void LoadTape(int level_nr)
   if (!(file = fopen(filename, MODE_READ)))
     return;
 
+#if 0
   /* check file identifier */
   fgets(cookie, MAX_LINE_LEN, file);
   if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n')
@@ -1672,20 +1780,56 @@ void LoadTape(int level_nr)
     return;
   }
 
-  if ((tape.file_version = getFileVersionFromCookieString(cookie)) == -1)
+  if ((level.file_version = getFileVersionFromCookieString(cookie)) == -1)
   {
-    Error(ERR_WARN, "unsupported version of tape file '%s'", filename);
+    Error(ERR_WARN, "unsupported version of level file '%s'", filename);
     fclose(file);
     return;
   }
+#else
+  getFileChunk(file, chunk_name, NULL, BYTE_ORDER_BIG_ENDIAN);
+  if (strcmp(chunk_name, "RND1") == 0)
+  {
+    getFile32BitInteger(file, BYTE_ORDER_BIG_ENDIAN);  /* not used */
+
+    getFileChunk(file, chunk_name, NULL, BYTE_ORDER_BIG_ENDIAN);
+    if (strcmp(chunk_name, "TAPE") != 0)
+    {
+      Error(ERR_WARN, "unknown format of tape file '%s'", filename);
+      fclose(file);
+      return;
+    }
+  }
+  else /* check for pre-2.0 file format with cookie string */
+  {
+    strcpy(cookie, chunk_name);
+    fgets(&cookie[4], MAX_LINE_LEN - 4, file);
+    if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n')
+      cookie[strlen(cookie) - 1] = '\0';
+
+    if (!checkCookieString(cookie, TAPE_COOKIE)) /* unknown file format */
+    {
+      Error(ERR_WARN, "unknown format of tape file '%s'", filename);
+      fclose(file);
+      return;
+    }
+
+    if ((tape.file_version = getFileVersionFromCookieString(cookie)) == -1)
+    {
+      Error(ERR_WARN, "unsupported version of tape file '%s'", filename);
+      fclose(file);
+      return;
+    }
+  }
+#endif
 
   tape.game_version = tape.file_version;
 
   if (tape.file_version < FILE_VERSION_1_2)
   {
     /* tape files from versions before 1.2.0 without chunk structure */
-    LoadTape_HEAD(&tape, file, TAPE_HEADER_SIZE);
-    LoadTape_BODY(&tape, file, 2 * tape.length);
+    LoadTape_HEAD(file, TAPE_HEADER_SIZE, &tape);
+    LoadTape_BODY(file, 2 * tape.length,  &tape);
   }
   else
   {
@@ -1693,10 +1837,11 @@ void LoadTape(int level_nr)
     {
       char *name;
       int size;
-      int (*loader)(struct TapeInfo *, FILE *, int);
+      int (*loader)(FILE *, int, struct TapeInfo *);
     }
     chunk_info[] =
     {
+      { "VERS", FILE_VERS_CHUNK_SIZE,  LoadTape_VERS },
       { "HEAD", TAPE_HEADER_SIZE,      LoadTape_HEAD },
       { "BODY", -1,                    LoadTape_BODY },
       {  NULL,  0,                     NULL }
@@ -1727,7 +1872,7 @@ void LoadTape(int level_nr)
       {
        /* call function to load this tape chunk */
        int chunk_size_expected =
-         (chunk_info[i].loader)(&tape, file, chunk_size);
+         (chunk_info[i].loader)(file, chunk_size, &tape);
 
        /* the size of some chunks cannot be checked before reading other
           chunks first (like "HEAD" and "BODY") that contain some header
@@ -1821,7 +1966,7 @@ void OLD_SaveTape(int level_nr)
     Request("tape saved !", REQ_CONFIRM);
 }
 
-static void SaveTape_HEAD(struct TapeInfo *tape, FILE *file)
+static void SaveTape_HEAD(FILE *file, struct TapeInfo *tape)
 {
   int i;
   byte store_participating_players = 0;
@@ -1840,7 +1985,7 @@ static void SaveTape_HEAD(struct TapeInfo *tape, FILE *file)
   WriteUnusedBytesToFile(file, TAPE_HEADER_UNUSED);
 }
 
-static void SaveTape_BODY(struct TapeInfo *tape, FILE *file)
+static void SaveTape_BODY(FILE *file, struct TapeInfo *tape)
 {
   int i, j;
 
@@ -1886,14 +2031,22 @@ void SaveTape(int level_nr)
 
   body_chunk_size = (num_participating_players + 1) * tape.length;
 
+#if 0
   fputs(TAPE_COOKIE, file);            /* file identifier */
   fputc('\n', file);
+#else
+  putFileChunk(file, "RND1", CHUNK_SIZE_UNDEFINED, BYTE_ORDER_BIG_ENDIAN);
+  putFileChunk(file, "TAPE", CHUNK_SIZE_NONE,      BYTE_ORDER_BIG_ENDIAN);
+
+  putFileChunk(file, "VERS", FILE_VERS_CHUNK_SIZE, BYTE_ORDER_BIG_ENDIAN);
+  WriteChunk_VERS(file, FILE_VERSION_ACTUAL, GAME_VERSION_ACTUAL);
+#endif
 
   putFileChunk(file, "HEAD", TAPE_HEADER_SIZE, BYTE_ORDER_BIG_ENDIAN);
-  SaveTape_HEAD(&tape, file);
+  SaveTape_HEAD(file, &tape);
 
   putFileChunk(file, "BODY", body_chunk_size, BYTE_ORDER_BIG_ENDIAN);
-  SaveTape_BODY(&tape, file);
+  SaveTape_BODY(file, &tape);
 
   fclose(file);
 
@@ -1917,7 +2070,8 @@ void DumpTape(struct TapeInfo *tape)
 
   printf("\n");
   printf("-------------------------------------------------------------------------------\n");
-  printf("TAPE OF LEVEL %d\n", tape->level_nr);
+  printf("Tape of Level %d (file version %06d, game version %06d\n",
+        tape->level_nr, tape->file_version, tape->game_version);
   printf("-------------------------------------------------------------------------------\n");
 
   for(i=0; i<tape->length; i++)

diff --git a/src/game.c b/src/game.c
index 32e9e0d62989d82a0e4d93facacca99be36d9e82..5dbf9df02a21b95923757ebeff666a09bc1c15a7 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -25,6 +25,9 @@
 /* this switch controls how rocks move horizontally */
 #define OLD_GAME_BEHAVIOUR     FALSE
 
+/* EXPERIMENTAL STUFF */
+#define USE_NEW_AMOEBA_CODE    FALSE
+
 /* for DigField() */
 #define DF_NO_PUSH             0
 #define DF_DIG                 1
@@ -437,6 +440,14 @@ void InitGame()
   boolean emulate_sb = TRUE;   /* unless non-SOKOBAN     elements found */
   boolean emulate_sp = TRUE;   /* unless non-SUPAPLEX    elements found */
 
+#if DEBUG
+#if USE_NEW_AMOEBA_CODE
+  printf("Using new amoeba code.\n");
+#else
+  printf("Using old amoeba code.\n");
+#endif
+#endif
+
   /* don't play tapes over network */
   network_playing = (options.network && !tape.playing);
 
@@ -4503,10 +4514,12 @@ void GameActions()
       AmoebeWaechst(x, y);
     else if (element == EL_DEAMOEBING)
       AmoebeSchrumpft(x, y);
-#if 0
+
+#if !USE_NEW_AMOEBA_CODE
     else if (IS_AMOEBALIVE(element))
       AmoebeAbleger(x, y);
 #endif
+
     else if (element == EL_LIFE || element == EL_LIFE_ASYNC)
       Life(x, y);
     else if (element == EL_ABLENK_EIN)
@@ -4590,8 +4603,8 @@ void GameActions()
     }
   }
 
-#if 1
-  /* new experimental amoeba growth stuff*/
+#if USE_NEW_AMOEBA_CODE
+  /* new experimental amoeba growth stuff */
 #if 1
   if (!(FrameCounter % 8))
 #endif

diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index d8140b7e8e09a189909ef7939bdba771ba45114b..f9abe2ad457e6995aceaf0edaa35f877a851e974 100644 (file)
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.c
@@ -709,8 +709,11 @@ boolean getFileChunk(FILE *file, char *chunk_name, int *chunk_size,
   /* read chunk name */
   fgets(chunk_name, chunk_name_length + 1, file);
 
-  /* read chunk size */
-  *chunk_size = getFile32BitInteger(file, byte_order);
+  if (chunk_size != NULL)
+  {
+    /* read chunk size */
+    *chunk_size = getFile32BitInteger(file, byte_order);
+  }
 
   return (feof(file) || ferror(file) ? FALSE : TRUE);
 }
@@ -721,8 +724,11 @@ void putFileChunk(FILE *file, char *chunk_name, int chunk_size,
   /* write chunk name */
   fputs(chunk_name, file);
 
-  /* write chunk size */
-  putFile32BitInteger(file, chunk_size, byte_order);
+  if (chunk_size >= 0)
+  {
+    /* write chunk size */
+    putFile32BitInteger(file, chunk_size, byte_order);
+  }
 }
 
 #define TRANSLATE_KEYSYM_TO_KEYNAME    0

diff --git a/src/main.h b/src/main.h
index cd00cd1af0662024e2be36b3f13fc26fe725c804..da629d537244d5e8a2330c6fdce43c6c9464f80d 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -1533,7 +1533,11 @@ extern int               num_element_info;
 #define SETUPINPUT             9
 #define CALIBRATION            10
 
+#define PROGRAM_VERSION_MAJOR  2
+#define PROGRAM_VERSION_MINOR  0
+#define PROGRAM_VERSION_PATCH  1
 #define PROGRAM_VERSION_STRING "2.0.1"
+
 #define PROGRAM_TITLE_STRING   "Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING  "Holger Schemel"
 #define PROGRAM_RIGHTS_STRING  "Copyright ^1995-2001 by"
@@ -1548,6 +1552,11 @@ extern int               num_element_info;
 #define X11_ICONMASK_FILENAME  "rocks_iconmask.xbm"
 #define MSDOS_POINTER_FILENAME "mouse.pcx"
 
+#define VERSION_IDENT(x,y,z)   ((x) * 10000 + (y) * 100 + (z))
+#define VERSION_MAJOR(x)       ((x) / 10000)
+#define VERSION_MINOR(x)       (((x) % 10000) / 100)
+#define VERSION_PATCH(x)       ((x) % 100)
+
 /* file version numbers for resource files (levels, tapes, score, setup, etc.)
 ** currently supported/known file version numbers:
 **     1.0 (old)
@@ -1555,16 +1564,24 @@ extern int              num_element_info;
 **     1.4 (still in use)
 **     2.0 (actual)
 */
-#define FILE_VERSION_1_0       10
-#define FILE_VERSION_1_2       12
-#define FILE_VERSION_1_4       14
-#define FILE_VERSION_2_0       20
+#define FILE_VERSION_1_0       VERSION_IDENT(1,0,0)
+#define FILE_VERSION_1_2       VERSION_IDENT(1,2,0)
+#define FILE_VERSION_1_4       VERSION_IDENT(1,4,0)
+#define FILE_VERSION_2_0       VERSION_IDENT(2,0,0)
+
+/* file version does not change for every program version, but is changed
+   when new features are introduced that are incompatible with older file
+   versions, so that they can be treated accordingly */
 #define FILE_VERSION_ACTUAL    FILE_VERSION_2_0
+
 #define GAME_VERSION_1_0       FILE_VERSION_1_0
 #define GAME_VERSION_1_2       FILE_VERSION_1_2
 #define GAME_VERSION_1_4       FILE_VERSION_1_4
 #define GAME_VERSION_2_0       FILE_VERSION_2_0
-#define GAME_VERSION_ACTUAL    GAME_VERSION_2_0
+
+#define GAME_VERSION_ACTUAL    VERSION_IDENT(PROGRAM_VERSION_MAJOR, \
+                                             PROGRAM_VERSION_MINOR, \
+                                             PROGRAM_VERSION_PATCH)
 
 /* for DrawGraphicAnimation() [tools.c] and AnimateToon() [cartoons.c] */
 #define ANIM_NORMAL            0