X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=71d01e945fd9f35c3d38ee7736d2e38e2f1d44a0;hb=720b0a62c8af0585e9517ed7a98ea336304c02e4;hp=a77b4463660c5821680defce31430e15ed4d09b7;hpb=d7d97176a88ee47f893055480c76b9c05a253d05;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index a77b4463..ebdd7afd 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1,1386 +1,2145 @@
 /***********************************************************
-*  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
+* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-*  (c) 1995-98 Artsoft Entertainment                       *
-*              Holger Schemel                              *
-*              Oststrasse 11a                              *
-*              33604 Bielefeld                             *
-*              phone: ++49 +521 290471                     *
-*              email: aeglos@valinor.owl.de                *
+* (c) 1995-2002 Artsoft Entertainment                      *
+*               Holger Schemel                             *
+*               Detmolder Strasse 189                      *
+*               33604 Bielefeld                            *
+*               Germany                                    *
+*               e-mail: info@artsoft.org                   *
 *----------------------------------------------------------*
-*  files.h                                                 *
+* files.c                                                  *
 ***********************************************************/
 
 #include <ctype.h>
+#include <sys/stat.h>
+
+#include "libgame/libgame.h"
 
 #include "files.h"
+#include "init.h"
 #include "tools.h"
-#include "misc.h"
 #include "tape.h"
-#include "joystick.h"
 
-boolean CreateNewScoreFile()
+
+#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	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	102	/* size of CUS3 chunk part    */
+#define LEVEL_CPART_CUS3_UNUSED	16	/* 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"
+#define SCORE_COOKIE		"ROCKSNDIAMONDS_SCORE_FILE_VERSION_1.2"
+
+
+/* ========================================================================= */
+/* level file functions                                                      */
+/* ========================================================================= */
+
+static void setLevelInfoToDefaults()
 {
-  int i,j,k;
-  char filename[MAX_FILENAME_LEN];
-  char empty_alias[MAX_NAMELEN];
-  FILE *file;
+  int i, j, x, y;
+
+  level.file_version = FILE_VERSION_ACTUAL;
+  level.game_version = GAME_VERSION_ACTUAL;
+
+  level.encoding_16bit_field = FALSE;	/* default: only 8-bit elements */
+  level.encoding_16bit_yamyam = FALSE;	/* default: only 8-bit elements */
+  level.encoding_16bit_amoeba = FALSE;	/* default: only 8-bit elements */
+
+  lev_fieldx = level.fieldx = STD_LEV_FIELDX;
+  lev_fieldy = level.fieldy = STD_LEV_FIELDY;
+
+  for(x=0; x<MAX_LEV_FIELDX; x++)
+    for(y=0; y<MAX_LEV_FIELDY; y++)
+      Feld[x][y] = Ur[x][y] = EL_SAND;
+
+  level.time = 100;
+  level.gems_needed = 0;
+  level.amoeba_speed = 10;
+  level.time_magic_wall = 10;
+  level.time_wheel = 10;
+  level.time_light = 10;
+  level.time_timegate = 10;
+  level.amoeba_content = EL_DIAMOND;
+  level.double_speed = FALSE;
+  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++)
+    level.author[i] = '\0';
+
+  strcpy(level.name, NAMELESS_LEVEL_NAME);
+  strcpy(level.author, ANONYMOUS_NAME);
+
+  for(i=0; i<LEVEL_SCORE_ELEMENTS; i++)
+    level.score[i] = 10;
+
+  level.num_yamyam_contents = STD_ELEMENT_CONTENTS;
+  for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
+    for(x=0; x<3; x++)
+      for(y=0; y<3; y++)
+	level.yamyam_content[i][x][y] =
+	  (i < STD_ELEMENT_CONTENTS ? EL_ROCK : EL_EMPTY);
+
+  Feld[0][0] = Ur[0][0] = EL_PLAYER_1;
+  Feld[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] =
+    Ur[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] = EL_EXIT_CLOSED;
+
+  for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
+  {
+    int element = EL_CUSTOM_START + i;
+
+    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;
+
+    for(x=0; x<3; x++)
+      for(y=0; y<3; y++)
+	element_info[element].content[x][y] = EL_EMPTY_SPACE;
 
-  sprintf(filename,"%s/%s/%s",
-	  level_directory,leveldir[leveldir_nr].filename,SCORE_FILENAME);
+    element_info[element].change.events = CE_BITMASK_DEFAULT;
+    element_info[element].change.target_element = EL_EMPTY_SPACE;
 
-  if (!(file=fopen(filename,"w")))
-    return(FALSE);
+    element_info[element].change.delay_fixed = 0;
+    element_info[element].change.delay_random = 0;
+    element_info[element].change.delay_frames = -1;	/* use default */
 
-  for(i=0;i<MAX_NAMELEN;i++)
-    empty_alias[i] = 0;
-  strncpy(empty_alias,EMPTY_ALIAS,MAX_NAMELEN-1);
+    element_info[element].change.trigger_element = EL_EMPTY_SPACE;
 
-  fputs(SCORE_COOKIE,file);		/* Formatkennung */
-  for(i=0;i<leveldir[leveldir_nr].levels;i++)
+    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;
+
+    /* start with no properties at all */
+    for (j=0; j < NUM_EP_BITFIELDS; j++)
+      Properties[element][j] = EP_BITMASK_DEFAULT;
+  }
+
+  BorderElement = EL_STEELWALL;
+
+  level.no_level_file = FALSE;
+
+  if (leveldir_current == NULL)		/* only when dumping level */
+    return;
+
+  /* try to determine better author name than 'anonymous' */
+  if (strcmp(leveldir_current->author, ANONYMOUS_NAME) != 0)
+  {
+    strncpy(level.author, leveldir_current->author, MAX_LEVEL_AUTHOR_LEN);
+    level.author[MAX_LEVEL_AUTHOR_LEN] = '\0';
+  }
+  else
   {
-    for(j=0;j<MAX_SCORE_ENTRIES;j++)
+    switch (LEVELCLASS(leveldir_current))
     {
-      for(k=0;k<MAX_NAMELEN;k++)
-	fputc(empty_alias[k],file);
-      fputc(0,file);
-      fputc(0,file);
+      case LEVELCLASS_TUTORIAL:
+	strcpy(level.author, PROGRAM_AUTHOR_STRING);
+	break;
+
+      case LEVELCLASS_CONTRIBUTION:
+	strncpy(level.author, leveldir_current->name,MAX_LEVEL_AUTHOR_LEN);
+	level.author[MAX_LEVEL_AUTHOR_LEN] = '\0';
+	break;
+
+      case LEVELCLASS_USER:
+	strncpy(level.author, getRealName(), MAX_LEVEL_AUTHOR_LEN);
+	level.author[MAX_LEVEL_AUTHOR_LEN] = '\0';
+	break;
+
+      default:
+	/* keep default value */
+	break;
     }
   }
-  fclose(file);
+}
+
+static int checkLevelElement(int element)
+{
+  if (element >= NUM_FILE_ELEMENTS)
+  {
+    Error(ERR_WARN, "invalid level element %d", element);
+    element = EL_CHAR_QUESTION;
+  }
+  else if (element == EL_PLAYER_OBSOLETE)
+    element = EL_PLAYER_1;
+  else if (element == EL_KEY_OBSOLETE)
+    element = EL_KEY_1;
 
-  chmod(filename, SCORE_PERMS);
-  return(TRUE);
+  return element;
 }
 
-boolean CreateNewNamesFile(int mode)
+static int LoadLevel_VERS(FILE *file, int chunk_size, struct LevelInfo *level)
 {
-  char filename[MAX_FILENAME_LEN];
-  FILE *file;
+  level->file_version = getFileVersion(file);
+  level->game_version = getFileVersion(file);
 
-  if (mode==PLAYER_LEVEL)
-    sprintf(filename,"%s/%s/%s",
-	    level_directory,leveldir[leveldir_nr].filename,NAMES_FILENAME);
-  else
-    sprintf(filename,"%s/%s",CONFIG_PATH,NAMES_FILENAME);
+  return chunk_size;
+}
+
+static int LoadLevel_HEAD(FILE *file, int chunk_size, struct LevelInfo *level)
+{
+  int i, x, y;
 
-  if (!(file=fopen(filename,"w")))
-    return(FALSE);
+  lev_fieldx = level->fieldx = fgetc(file);
+  lev_fieldy = level->fieldy = fgetc(file);
 
-  fputs(NAMES_COOKIE,file);		/* Formatkennung */
-  fclose(file);
+  level->time		= getFile16BitBE(file);
+  level->gems_needed	= getFile16BitBE(file);
+
+  for(i=0; i<MAX_LEVEL_NAME_LEN; i++)
+    level->name[i] = fgetc(file);
+  level->name[MAX_LEVEL_NAME_LEN] = 0;
+
+  for(i=0; i<LEVEL_SCORE_ELEMENTS; i++)
+    level->score[i] = fgetc(file);
+
+  level->num_yamyam_contents = STD_ELEMENT_CONTENTS;
+  for(i=0; i<STD_ELEMENT_CONTENTS; i++)
+    for(y=0; y<3; y++)
+      for(x=0; x<3; x++)
+	level->yamyam_content[i][x][y] = checkLevelElement(fgetc(file));
+
+  level->amoeba_speed		= fgetc(file);
+  level->time_magic_wall	= fgetc(file);
+  level->time_wheel		= fgetc(file);
+  level->amoeba_content		= checkLevelElement(fgetc(file));
+  level->double_speed		= (fgetc(file) == 1 ? TRUE : FALSE);
+  level->gravity		= (fgetc(file) == 1 ? TRUE : FALSE);
+  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);
 
-  chmod(filename, NAMES_PERMS);
-  return(TRUE);
+  ReadUnusedBytesFromFile(file, LEVEL_HEADER_UNUSED);
+
+  return chunk_size;
 }
 
-boolean LoadLevelInfo()
+static int LoadLevel_AUTH(FILE *file, int chunk_size, struct LevelInfo *level)
 {
   int i;
-  char filename[MAX_FILENAME_LEN];
-  char cookie[MAX_FILENAME_LEN];
-  FILE *file;
 
-  sprintf(filename,"%s/%s",level_directory,LEVDIR_FILENAME);
+  for(i=0; i<MAX_LEVEL_AUTHOR_LEN; i++)
+    level->author[i] = fgetc(file);
+  level->author[MAX_LEVEL_NAME_LEN] = 0;
+
+  return 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;
+
+  /* Note: "chunk_size" was wrong before version 2.0 when elements are
+     stored with 16-bit encoding (and should be twice as big then).
+     Even worse, playfield data was stored 16-bit when only yamyam content
+     contained 16-bit elements and vice versa. */
 
-  if (!(file=fopen(filename,"r")))
+  if (level->encoding_16bit_field && level->file_version >= FILE_VERSION_2_0)
+    chunk_size_expected *= 2;
+
+  if (chunk_size_expected != chunk_size)
   {
-    Error(ERR_RETURN, "cannot read level info '%s'", filename);
-    return(FALSE);
+    ReadUnusedBytesFromFile(file, chunk_size);
+    return chunk_size_expected;
   }
 
-  fscanf(file,"%s\n",cookie);
-  if (strcmp(cookie,LEVELDIR_COOKIE))	/* ungültiges Format? */
+  for(y=0; y<level->fieldy; y++)
+    for(x=0; x<level->fieldx; x++)
+      Feld[x][y] = Ur[x][y] =
+	checkLevelElement(level->encoding_16bit_field ?
+			  getFile16BitBE(file) : fgetc(file));
+  return chunk_size;
+}
+
+static int LoadLevel_CONT(FILE *file, int chunk_size, struct LevelInfo *level)
+{
+  int i, x, y;
+  int header_size = 4;
+  int content_size = MAX_ELEMENT_CONTENTS * 3 * 3;
+  int chunk_size_expected = header_size + content_size;
+
+  /* Note: "chunk_size" was wrong before version 2.0 when elements are
+     stored with 16-bit encoding (and should be twice as big then).
+     Even worse, playfield data was stored 16-bit when only yamyam content
+     contained 16-bit elements and vice versa. */
+
+  if (level->encoding_16bit_field && level->file_version >= FILE_VERSION_2_0)
+    chunk_size_expected += content_size;
+
+  if (chunk_size_expected != chunk_size)
   {
-    Error(ERR_RETURN, "wrong format of level info file");
-    fclose(file);
-    return(FALSE);
+    ReadUnusedBytesFromFile(file, chunk_size);
+    return chunk_size_expected;
   }
 
-  num_leveldirs = 0;
-  leveldir_nr = 0;
-  for(i=0;i<MAX_LEVDIR_ENTRIES;i++)
+  fgetc(file);
+  level->num_yamyam_contents = fgetc(file);
+  fgetc(file);
+  fgetc(file);
+
+  /* correct invalid number of content fields -- should never happen */
+  if (level->num_yamyam_contents < 1 ||
+      level->num_yamyam_contents > MAX_ELEMENT_CONTENTS)
+    level->num_yamyam_contents = STD_ELEMENT_CONTENTS;
+
+  for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
+    for(y=0; y<3; y++)
+      for(x=0; x<3; x++)
+	level->yamyam_content[i][x][y] =
+	  checkLevelElement(level->encoding_16bit_field ?
+			    getFile16BitBE(file) : fgetc(file));
+  return chunk_size;
+}
+
+static int LoadLevel_CNT2(FILE *file, int chunk_size, struct LevelInfo *level)
+{
+  int i, x, y;
+  int element;
+  int num_contents, content_xsize, content_ysize;
+  int content_array[MAX_ELEMENT_CONTENTS][3][3];
+
+  element = checkLevelElement(getFile16BitBE(file));
+  num_contents = fgetc(file);
+  content_xsize = fgetc(file);
+  content_ysize = fgetc(file);
+  ReadUnusedBytesFromFile(file, LEVEL_CHUNK_CNT2_UNUSED);
+
+  for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
+    for(y=0; y<3; y++)
+      for(x=0; x<3; x++)
+	content_array[i][x][y] = checkLevelElement(getFile16BitBE(file));
+
+  /* correct invalid number of content fields -- should never happen */
+  if (num_contents < 1 || num_contents > MAX_ELEMENT_CONTENTS)
+    num_contents = STD_ELEMENT_CONTENTS;
+
+  if (element == EL_YAMYAM)
   {
-    fscanf(file,"%s",leveldir[i].filename);
-    fscanf(file,"%s",leveldir[i].name);
-    fscanf(file,"%d",&leveldir[i].levels);
-    fscanf(file,"%d",&leveldir[i].readonly);
-    if (feof(file))
-      break;
+    level->num_yamyam_contents = num_contents;
 
-    num_leveldirs++;
+    for(i=0; i<num_contents; i++)
+      for(y=0; y<3; y++)
+	for(x=0; x<3; x++)
+	  level->yamyam_content[i][x][y] = content_array[i][x][y];
   }
-
-  if (!num_leveldirs)
+  else if (element == EL_BD_AMOEBA)
   {
-    Error(ERR_RETURN, "empty level info '%s'", filename);
-    return(FALSE);
+    level->amoeba_content = content_array[0][0][0];
+  }
+  else
+  {
+    Error(ERR_WARN, "cannot load content for element '%d'", element);
   }
 
-  return(TRUE);
+  return chunk_size;
 }
 
-void LoadLevel(int level_nr)
+static int LoadLevel_CUS1(FILE *file, int chunk_size, struct LevelInfo *level)
 {
-  int i,x,y;
-  char filename[MAX_FILENAME_LEN];
-  char cookie[MAX_FILENAME_LEN];
-  FILE *file;
+  int num_changed_custom_elements = getFile16BitBE(file);
+  int chunk_size_expected = 2 + num_changed_custom_elements * 6;
+  int i;
 
-  sprintf(filename,"%s/%s/%d",
-	  level_directory,leveldir[leveldir_nr].filename,level_nr);
+  if (chunk_size_expected != chunk_size)
+  {
+    ReadUnusedBytesFromFile(file, chunk_size - 2);
+    return chunk_size_expected;
+  }
 
-  if (!(file = fopen(filename,"r")))
-    Error(ERR_RETURN, "cannot read level '%s' - creating new level", filename);
-  else
+  for (i=0; i < num_changed_custom_elements; i++)
   {
-    fgets(cookie,LEVEL_COOKIE_LEN,file);
-    fgetc(file);
+    int element = getFile16BitBE(file);
+    int properties = getFile32BitBE(file);
 
-    if (strcmp(cookie,LEVEL_COOKIE))	/* ungültiges Format? */
-    {
-      Error(ERR_RETURN, "wrong format of level file '%s'", filename);
-      fclose(file);
-      file = NULL;
-    }
+    if (IS_CUSTOM_ELEMENT(element))
+      Properties[element][EP_BITFIELD_BASE] = properties;
+    else
+      Error(ERR_WARN, "invalid custom element number %d", element);
   }
 
-  if (file)
+  return chunk_size;
+}
+
+static int LoadLevel_CUS2(FILE *file, int chunk_size, struct LevelInfo *level)
+{
+  int num_changed_custom_elements = getFile16BitBE(file);
+  int chunk_size_expected = 2 + num_changed_custom_elements * 4;
+  int i;
+
+  if (chunk_size_expected != chunk_size)
   {
-    lev_fieldx = level.fieldx = fgetc(file);
-    lev_fieldy = level.fieldy = fgetc(file);
-
-    level.time		= (fgetc(file)<<8) | fgetc(file);
-    level.edelsteine	= (fgetc(file)<<8) | fgetc(file);
-    for(i=0;i<MAX_LEVNAMLEN;i++)
-      level.name[i]	= fgetc(file);
-    level.name[MAX_LEVNAMLEN-1] = 0;
-    for(i=0;i<MAX_LEVSCORE_ENTRIES;i++)
-      level.score[i]	= fgetc(file);
-    for(i=0;i<4;i++)
-      for(y=0;y<3;y++)
-	for(x=0;x<3;x++)
-	  level.mampfer_inhalt[i][x][y] = fgetc(file);
-    level.tempo_amoebe	= fgetc(file);
-    level.dauer_sieb	= fgetc(file);
-    level.dauer_ablenk	= fgetc(file);
-    level.amoebe_inhalt = fgetc(file);
-
-    for(i=0;i<NUM_FREE_LVHD_BYTES;i++)	/* Rest frei / Headergröße 80 Bytes */
-      fgetc(file);
-
-    for(y=0;y<MAX_LEV_FIELDY;y++) 
-      for(x=0;x<MAX_LEV_FIELDX;x++) 
-	Feld[x][y] = Ur[x][y] = EL_ERDREICH;
-
-    for(y=0;y<lev_fieldy;y++) 
-      for(x=0;x<lev_fieldx;x++) 
-	Feld[x][y] = Ur[x][y] = fgetc(file);
+    ReadUnusedBytesFromFile(file, chunk_size - 2);
+    return chunk_size_expected;
+  }
 
-    fclose(file);
+  for (i=0; i < num_changed_custom_elements; i++)
+  {
+    int element = getFile16BitBE(file);
+    int custom_target_element = getFile16BitBE(file);
 
-    if (level.time<=10)	/* Mindestspieldauer */
-      level.time = 10;
+    if (IS_CUSTOM_ELEMENT(element))
+      element_info[element].change.target_element = custom_target_element;
+    else
+      Error(ERR_WARN, "invalid custom element number %d", element);
   }
-  else
+
+  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, x, y;
+
+  if (chunk_size_expected != chunk_size)
   {
-    lev_fieldx = level.fieldx = STD_LEV_FIELDX;
-    lev_fieldy = level.fieldy = STD_LEV_FIELDY;
-
-    level.time		= 100;
-    level.edelsteine	= 0;
-    strncpy(level.name,"Nameless Level",MAX_LEVNAMLEN-1);
-    for(i=0;i<MAX_LEVSCORE_ENTRIES;i++)
-      level.score[i]	= 10;
-    for(i=0;i<4;i++)
-      for(y=0;y<3;y++)
-	for(x=0;x<3;x++)
-	  level.mampfer_inhalt[i][x][y] = EL_FELSBROCKEN;
-    level.tempo_amoebe	= 10;
-    level.dauer_sieb	= 10;
-    level.dauer_ablenk	= 10;
-    level.amoebe_inhalt = EL_DIAMANT;
-
-    for(y=0;y<STD_LEV_FIELDY;y++) 
-      for(x=0;x<STD_LEV_FIELDX;x++) 
-	Feld[x][y] = Ur[x][y] = EL_ERDREICH;
-    Feld[0][0] = Ur[0][0] = EL_SPIELFIGUR;
-    Feld[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] =
-      Ur[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] = EL_AUSGANG_ZU;
+    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 */
+    }
+
+    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));
+
+    /* some free bytes for future properties and padding */
+    ReadUnusedBytesFromFile(file, LEVEL_CPART_CUS3_UNUSED);
+  }
+
+  return chunk_size;
 }
 
-void LoadLevelTape(int level_nr)
+void LoadLevelFromFilename(char *filename)
 {
-  int i;
-  char filename[MAX_FILENAME_LEN];
-  char cookie[MAX_FILENAME_LEN];
+  char cookie[MAX_LINE_LEN];
+  char chunk_name[CHUNK_ID_LEN + 1];
+  int chunk_size;
   FILE *file;
-  boolean levelrec_10 = FALSE;
-
-#ifndef MSDOS
-  sprintf(filename,"%s/%s/%d.tape",
-	  level_directory,leveldir[leveldir_nr].filename,level_nr);
-#else
-  sprintf(filename,"%s/%s/%d.tap",
-	  level_directory,leveldir[leveldir_nr].filename,level_nr);
-#endif
 
-  if ((file=fopen(filename,"r")))
+  /* always start with reliable default values */
+  setLevelInfoToDefaults();
+
+  if (!(file = fopen(filename, MODE_READ)))
+  {
+    level.no_level_file = TRUE;
+
+    Error(ERR_WARN, "cannot read level '%s' - creating new level", filename);
+    return;
+  }
+
+  getFileChunkBE(file, chunk_name, NULL);
+  if (strcmp(chunk_name, "RND1") == 0)
   {
-    fgets(cookie,LEVELREC_COOKIE_LEN,file);
-    fgetc(file);
-    if (!strcmp(cookie,LEVELREC_COOKIE_10))	/* old 1.0 tape format */
-      levelrec_10 = TRUE;
-    else if (strcmp(cookie,LEVELREC_COOKIE))	/* unknown tape format */
+    getFile32BitBE(file);		/* not used */
+
+    getFileChunkBE(file, chunk_name, NULL);
+    if (strcmp(chunk_name, "CAVE") != 0)
     {
-      Error(ERR_RETURN, "wrong format of level recording file '%s'", filename);
+      Error(ERR_WARN, "unknown format of level file '%s'", filename);
       fclose(file);
-      file = NULL;
+      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 (!file)
-    return;
+    if (!checkCookieString(cookie, LEVEL_COOKIE_TMPL))
+    {
+      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;
+    }
 
-  tape.random_seed =
-    (fgetc(file)<<24) | (fgetc(file)<<16) | (fgetc(file)<<8) | fgetc(file);
-  tape.date =
-    (fgetc(file)<<24) | (fgetc(file)<<16) | (fgetc(file)<<8) | fgetc(file);
-  tape.length =
-    (fgetc(file)<<24) | (fgetc(file)<<16) | (fgetc(file)<<8) | fgetc(file);
+    /* pre-2.0 level files have no game version, so use file version here */
+    level.game_version = level.file_version;
+  }
 
-  tape.level_nr = level_nr;
-  tape.counter = 0;
-  tape.changed = FALSE;
+  if (level.file_version < FILE_VERSION_1_2)
+  {
+    /* level files from versions before 1.2.0 without chunk structure */
+    LoadLevel_HEAD(file, LEVEL_HEADER_SIZE,           &level);
+    LoadLevel_BODY(file, level.fieldx * level.fieldy, &level);
+  }
+  else
+  {
+    static struct
+    {
+      char *name;
+      int size;
+      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 },
+      { "BODY", -1,			LoadLevel_BODY },
+      { "CONT", -1,			LoadLevel_CONT },
+      { "CNT2", LEVEL_CHUNK_CNT2_SIZE,	LoadLevel_CNT2 },
+      { "CUS1", -1,			LoadLevel_CUS1 },
+      { "CUS2", -1,			LoadLevel_CUS2 },
+      { "CUS3", -1,			LoadLevel_CUS3 },
+      {  NULL,  0,			NULL }
+    };
+
+    while (getFileChunkBE(file, chunk_name, &chunk_size))
+    {
+      int i = 0;
 
-  tape.recording = FALSE;
-  tape.playing = FALSE;
-  tape.pausing = FALSE;
+      while (chunk_info[i].name != NULL &&
+	     strcmp(chunk_name, chunk_info[i].name) != 0)
+	i++;
 
-  for(i=0;i<tape.length;i++)
+      if (chunk_info[i].name == NULL)
+      {
+	Error(ERR_WARN, "unknown chunk '%s' in level file '%s'",
+	      chunk_name, filename);
+	ReadUnusedBytesFromFile(file, chunk_size);
+      }
+      else if (chunk_info[i].size != -1 &&
+	       chunk_info[i].size != chunk_size)
+      {
+	Error(ERR_WARN, "wrong size (%d) of chunk '%s' in level file '%s'",
+	      chunk_size, chunk_name, filename);
+	ReadUnusedBytesFromFile(file, chunk_size);
+      }
+      else
+      {
+	/* call function to load this level chunk */
+	int chunk_size_expected =
+	  (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
+	   information, so check them here */
+	if (chunk_size_expected != chunk_size)
+	{
+	  Error(ERR_WARN, "wrong size (%d) of chunk '%s' in level file '%s'",
+		chunk_size, chunk_name, filename);
+	}
+      }
+    }
+  }
+
+  fclose(file);
+
+  if (leveldir_current == NULL)		/* only when dumping level */
+    return;
+
+  if (IS_LEVELCLASS_CONTRIBUTION(leveldir_current) ||
+      IS_LEVELCLASS_USER(leveldir_current))
   {
-    int j;
+    /* For user contributed and private levels, use the version of
+       the game engine the levels were created for.
+       Since 2.0.1, the game engine version is now directly stored
+       in the level file (chunk "VERS"), so there is no need anymore
+       to set the game version from the file version (except for old,
+       pre-2.0 levels, where the game version is still taken from the
+       file format version used to store the level -- see above). */
+
+    /* do some special adjustments to support older level versions */
+    if (level.file_version == FILE_VERSION_1_0)
+    {
+      Error(ERR_WARN, "level file '%s' has version number 1.0", filename);
+      Error(ERR_WARN, "using high speed movement for player");
 
-    if (i >= MAX_TAPELEN)
-      break;
+      /* player was faster than monsters in (pre-)1.0 levels */
+      level.double_speed = TRUE;
+    }
 
-    for(j=0; j<MAX_PLAYERS; j++)
+    /* Default behaviour for EM style gems was "slippery" only in 2.0.1 */
+    if (level.game_version == VERSION_IDENT(2,0,1))
+      level.em_slippery_gems = TRUE;
+  }
+  else
+  {
+    /* Always use the latest version of the game engine for all but
+       user contributed and private levels; this allows for actual
+       corrections in the game engine to take effect for existing,
+       converted levels (from "classic" or other existing games) to
+       make the game emulation more accurate, while (hopefully) not
+       breaking existing levels created from other players. */
+
+    level.game_version = GAME_VERSION_ACTUAL;
+
+    /* Set special EM style gems behaviour: EM style gems slip down from
+       normal, steel and growing wall. As this is a more fundamental change,
+       it seems better to set the default behaviour to "off" (as it is more
+       natural) and make it configurable in the level editor (as a property
+       of gem style elements). Already existing converted levels (neither
+       private nor contributed levels) are changed to the new behaviour. */
+
+    if (level.file_version < FILE_VERSION_2_0)
+      level.em_slippery_gems = TRUE;
+  }
+
+  /* map some elements which have changed in newer versions */
+  if (level.game_version <= VERSION_IDENT(2,2,0))
+  {
+    int x, y;
+
+    /* map game font elements */
+    for(y=0; y<level.fieldy; y++)
     {
-      if (levelrec_10 && j>0)
+      for(x=0; x<level.fieldx; x++)
       {
-	tape.pos[i].action[j] = MV_NO_MOVING;
-	continue;
+	int element = Ur[x][y];
+
+	if (element == EL_CHAR('['))
+	  element = EL_CHAR_AUMLAUT;
+	else if (element == EL_CHAR('\\'))
+	  element = EL_CHAR_OUMLAUT;
+	else if (element == EL_CHAR(']'))
+	  element = EL_CHAR_UUMLAUT;
+	else if (element == EL_CHAR('^'))
+	  element = EL_CHAR_COPYRIGHT;
+
+	Feld[x][y] = Ur[x][y] = element;
       }
-      tape.pos[i].action[j] = fgetc(file);
     }
+  }
 
-    tape.pos[i].delay = fgetc(file);
+  /* determine border element for this level */
+  SetBorderElement();
+}
 
-    if (feof(file))
-      break;
-  }
+void LoadLevel(int level_nr)
+{
+  char *filename = getLevelFilename(level_nr);
 
-  fclose(file);
+  LoadLevelFromFilename(filename);
+  InitElementPropertiesEngine(level.game_version);
+}
 
-  if (i != tape.length)
-    Error(ERR_RETURN, "level recording file '%s' corrupted", filename);
+static void SaveLevel_VERS(FILE *file, struct LevelInfo *level)
+{
+  putFileVersion(file, level->file_version);
+  putFileVersion(file, level->game_version);
+}
 
-  tape.length_seconds = GetTapeLength();
+static void SaveLevel_HEAD(FILE *file, struct LevelInfo *level)
+{
+  int i, x, y;
+
+  fputc(level->fieldx, file);
+  fputc(level->fieldy, file);
+
+  putFile16BitBE(file, level->time);
+  putFile16BitBE(file, level->gems_needed);
+
+  for(i=0; i<MAX_LEVEL_NAME_LEN; i++)
+    fputc(level->name[i], file);
+
+  for(i=0; i<LEVEL_SCORE_ELEMENTS; i++)
+    fputc(level->score[i], file);
+
+  for(i=0; i<STD_ELEMENT_CONTENTS; i++)
+    for(y=0; y<3; y++)
+      for(x=0; x<3; x++)
+	fputc((level->encoding_16bit_yamyam ? EL_EMPTY :
+	       level->yamyam_content[i][x][y]),
+	      file);
+  fputc(level->amoeba_speed, file);
+  fputc(level->time_magic_wall, file);
+  fputc(level->time_wheel, file);
+  fputc((level->encoding_16bit_amoeba ? EL_EMPTY : level->amoeba_content),
+	file);
+  fputc((level->double_speed ? 1 : 0), file);
+  fputc((level->gravity ? 1 : 0), file);
+  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);
 }
 
-void LoadScore(int level_nr)
+static void SaveLevel_AUTH(FILE *file, struct LevelInfo *level)
 {
-  int i,j;
-  char filename[MAX_FILENAME_LEN];
-  char cookie[MAX_FILENAME_LEN];
-  FILE *file;
+  int i;
+
+  for(i=0; i<MAX_LEVEL_AUTHOR_LEN; i++)
+    fputc(level->author[i], file);
+}
 
-  sprintf(filename,"%s/%s/%s",
-	  level_directory,leveldir[leveldir_nr].filename,SCORE_FILENAME);
+static void SaveLevel_BODY(FILE *file, struct LevelInfo *level)
+{
+  int x, y;
+
+  for(y=0; y<level->fieldy; y++) 
+    for(x=0; x<level->fieldx; x++) 
+      if (level->encoding_16bit_field)
+	putFile16BitBE(file, Ur[x][y]);
+      else
+	fputc(Ur[x][y], file);
+}
 
-  if (!(file = fopen(filename,"r")))
+#if 0
+static void SaveLevel_CONT(FILE *file, struct LevelInfo *level)
+{
+  int i, x, y;
+
+  fputc(EL_YAMYAM, file);
+  fputc(level->num_yamyam_contents, file);
+  fputc(0, file);
+  fputc(0, file);
+
+  for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
+    for(y=0; y<3; y++)
+      for(x=0; x<3; x++)
+	if (level->encoding_16bit_field)
+	  putFile16BitBE(file, level->yamyam_content[i][x][y]);
+	else
+	  fputc(level->yamyam_content[i][x][y], file);
+}
+#endif
+
+static void SaveLevel_CNT2(FILE *file, struct LevelInfo *level, int element)
+{
+  int i, x, y;
+  int num_contents, content_xsize, content_ysize;
+  int content_array[MAX_ELEMENT_CONTENTS][3][3];
+
+  if (element == EL_YAMYAM)
   {
-    if (!CreateNewScoreFile())
-      Error(ERR_RETURN, "cannot create score file '%s'", filename);
-    else if (!(file = fopen(filename,"r"))) 
-      Error(ERR_RETURN, "cannot read score for level %d", level_nr);
+    num_contents = level->num_yamyam_contents;
+    content_xsize = 3;
+    content_ysize = 3;
+
+    for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
+      for(y=0; y<3; y++)
+	for(x=0; x<3; x++)
+	  content_array[i][x][y] = level->yamyam_content[i][x][y];
   }
+  else if (element == EL_BD_AMOEBA)
+  {
+    num_contents = 1;
+    content_xsize = 1;
+    content_ysize = 1;
+
+    for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
+      for(y=0; y<3; y++)
+	for(x=0; x<3; x++)
+	  content_array[i][x][y] = EL_EMPTY;
+    content_array[0][0][0] = level->amoeba_content;
+  }
+  else
+  {
+    /* chunk header already written -- write empty chunk data */
+    WriteUnusedBytesToFile(file, LEVEL_CHUNK_CNT2_SIZE);
+
+    Error(ERR_WARN, "cannot save content for element '%d'", element);
+    return;
+  }
+
+  putFile16BitBE(file, element);
+  fputc(num_contents, file);
+  fputc(content_xsize, file);
+  fputc(content_ysize, file);
+
+  WriteUnusedBytesToFile(file, LEVEL_CHUNK_CNT2_UNUSED);
 
-  if (file)
+  for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
+    for(y=0; y<3; y++)
+      for(x=0; x<3; x++)
+	putFile16BitBE(file, content_array[i][x][y]);
+}
+
+#if 0
+static void SaveLevel_CUS1(FILE *file, struct LevelInfo *level,
+			   int num_changed_custom_elements)
+{
+  int i, check = 0;
+
+  putFile16BitBE(file, num_changed_custom_elements);
+
+  for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
   {
-    fgets(cookie,SCORE_COOKIE_LEN,file);
-    if (strcmp(cookie,SCORE_COOKIE))	/* ungültiges Format? */
+    int element = EL_CUSTOM_START + i;
+
+    if (Properties[element][EP_BITFIELD_BASE] != EP_BITMASK_DEFAULT)
     {
-      Error(ERR_RETURN, "wrong format of score file '%s'", filename);
-      fclose(file);
-      file = NULL;
+      if (check < num_changed_custom_elements)
+      {
+	putFile16BitBE(file, element);
+	putFile32BitBE(file, Properties[element][EP_BITFIELD_BASE]);
+      }
+
+      check++;
     }
   }
 
-  if (file)
+  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)
+{
+  int i, check = 0;
+
+  putFile16BitBE(file, num_changed_custom_elements);
+
+  for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
   {
-    fseek(file,
-	  SCORE_COOKIE_LEN-1+level_nr*(MAX_SCORE_ENTRIES*(MAX_NAMELEN+2)),
-	  SEEK_SET);
-    for(i=0;i<MAX_SCORE_ENTRIES;i++)
+    int element = EL_CUSTOM_START + i;
+
+    if (element_info[element].change.target_element != EL_EMPTY_SPACE)
     {
-      for(j=0;j<MAX_NAMELEN;j++)
-	highscore[i].Name[j] = fgetc(file);
-      highscore[i].Score = (fgetc(file)<<8) | fgetc(file);
+      if (check < num_changed_custom_elements)
+      {
+	putFile16BitBE(file, element);
+	putFile16BitBE(file, element_info[element].change.target_element);
+      }
+
+      check++;
     }
-    fclose(file);
   }
-  else
+
+  if (check != num_changed_custom_elements)	/* should not happen */
+    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, x, y, check = 0;
+
+  putFile16BitBE(file, num_changed_custom_elements);
+
+  for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
   {
-    for(i=0;i<MAX_SCORE_ENTRIES;i++)
+    int element = EL_CUSTOM_START + i;
+
+    if (Properties[element][EP_BITFIELD_BASE] != EP_BITMASK_DEFAULT)
     {
-      strcpy(highscore[i].Name,EMPTY_ALIAS);
-      highscore[i].Score = 0;
+      if (check < num_changed_custom_elements)
+      {
+	putFile16BitBE(file, element);
+	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]);
+
+	/* 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 LoadPlayerInfo(int mode)
+void SaveLevel(int level_nr)
 {
-  int i;
-  char filename[MAX_FILENAME_LEN];
-  char cookie[MAX_FILENAME_LEN];
+  char *filename = getLevelFilename(level_nr);
+  int body_chunk_size;
+  int num_changed_custom_elements = 0;
+  int level_chunk_CUS3_size;
+  int i, x, y;
   FILE *file;
-  char *login_name = GetLoginName();
-  struct PlayerInfo default_player, new_player;
-  int version_10_file = FALSE;
 
-  if (mode==PLAYER_LEVEL)
-    sprintf(filename,"%s/%s/%s",
-	    level_directory,leveldir[leveldir_nr].filename,NAMES_FILENAME);
-  else
-    sprintf(filename,"%s/%s",CONFIG_PATH,NAMES_FILENAME);
+  if (!(file = fopen(filename, MODE_WRITE)))
+  {
+    Error(ERR_WARN, "cannot save level file '%s'", filename);
+    return;
+  }
 
-  for(i=0;i<MAX_NAMELEN;i++)
-    default_player.login_name[i] = default_player.alias_name[i] = 0;
-  strncpy(default_player.login_name,login_name,MAX_NAMELEN-1);
-  strncpy(default_player.alias_name,login_name,MAX_NAMELEN-1);
-  default_player.handicap = 0;
-  default_player.setup = DEFAULT_SETUP;
-  default_player.leveldir_nr = 0;
-  default_player.level_nr = 0;
+  level.file_version = FILE_VERSION_ACTUAL;
+  level.game_version = GAME_VERSION_ACTUAL;
 
-  new_player = default_player;
+  /* check level field for 16-bit elements */
+  level.encoding_16bit_field = FALSE;
+  for(y=0; y<level.fieldy; y++) 
+    for(x=0; x<level.fieldx; x++) 
+      if (Ur[x][y] > 255)
+	level.encoding_16bit_field = TRUE;
 
-  if (!(file = fopen(filename,"r")))
+  /* check yamyam content for 16-bit elements */
+  level.encoding_16bit_yamyam = FALSE;
+  for(i=0; i<level.num_yamyam_contents; i++)
+    for(y=0; y<3; y++)
+      for(x=0; x<3; x++)
+	if (level.yamyam_content[i][x][y] > 255)
+	  level.encoding_16bit_yamyam = TRUE;
+
+  /* check amoeba content for 16-bit elements */
+  level.encoding_16bit_amoeba = FALSE;
+  if (level.amoeba_content > 255)
+    level.encoding_16bit_amoeba = TRUE;
+
+  /* calculate size of "BODY" chunk */
+  body_chunk_size =
+    level.fieldx * level.fieldy * (level.encoding_16bit_field ? 2 : 1);
+
+  /* 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_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);
+
+  putFileChunkBE(file, "VERS", FILE_VERS_CHUNK_SIZE);
+  SaveLevel_VERS(file, &level);
+
+  putFileChunkBE(file, "HEAD", LEVEL_HEADER_SIZE);
+  SaveLevel_HEAD(file, &level);
+
+  putFileChunkBE(file, "AUTH", MAX_LEVEL_AUTHOR_LEN);
+  SaveLevel_AUTH(file, &level);
+
+  putFileChunkBE(file, "BODY", body_chunk_size);
+  SaveLevel_BODY(file, &level);
+
+  if (level.encoding_16bit_yamyam ||
+      level.num_yamyam_contents != STD_ELEMENT_CONTENTS)
   {
-    if (!CreateNewNamesFile(mode))
-      Error(ERR_RETURN, "cannot create names file '%s'", filename);
-    else if (!(file = fopen(filename,"r"))) 
-      Error(ERR_RETURN, "cannot read player information file '%s'", filename);
+    putFileChunkBE(file, "CNT2", LEVEL_CHUNK_CNT2_SIZE);
+    SaveLevel_CNT2(file, &level, EL_YAMYAM);
   }
 
-  if (file)
+  if (level.encoding_16bit_amoeba)
   {
-    fgets(cookie,NAMES_COOKIE_LEN,file);
-    if (!strcmp(cookie,NAMES_COOKIE_10))	/* altes Format? */
-      version_10_file = TRUE;
-    else if (strcmp(cookie,NAMES_COOKIE))	/* ungültiges Format? */
+    putFileChunkBE(file, "CNT2", LEVEL_CHUNK_CNT2_SIZE);
+    SaveLevel_CNT2(file, &level, EL_BD_AMOEBA);
+  }
+
+  if (num_changed_custom_elements > 0)
+  {
+    putFileChunkBE(file, "CUS3", level_chunk_CUS3_size);
+    SaveLevel_CUS3(file, &level, num_changed_custom_elements);
+  }
+
+  fclose(file);
+
+  SetFilePermissions(filename, PERMS_PRIVATE);
+}
+
+void DumpLevel(struct LevelInfo *level)
+{
+  printf_line("-", 79);
+  printf("Level xxx (file version %08d, game version %08d)\n",
+	 level->file_version, level->game_version);
+  printf_line("-", 79);
+
+  printf("Level Author: '%s'\n", level->author);
+  printf("Level Title:  '%s'\n", level->name);
+  printf("\n");
+  printf("Playfield Size: %d x %d\n", level->fieldx, level->fieldy);
+  printf("\n");
+  printf("Level Time:  %d seconds\n", level->time);
+  printf("Gems needed: %d\n", level->gems_needed);
+  printf("\n");
+  printf("Time for Magic Wall: %d seconds\n", level->time_magic_wall);
+  printf("Time for Wheel:      %d seconds\n", level->time_wheel);
+  printf("Time for Light:      %d seconds\n", level->time_light);
+  printf("Time for Timegate:   %d seconds\n", level->time_timegate);
+  printf("\n");
+  printf("Amoeba Speed: %d\n", level->amoeba_speed);
+  printf("\n");
+  printf("Gravity:                %s\n", (level->gravity ? "yes" : "no"));
+  printf("Double Speed Movement:  %s\n", (level->double_speed ? "yes" : "no"));
+  printf("EM style slippery gems: %s\n", (level->em_slippery_gems ? "yes" : "no"));
+
+  printf_line("-", 79);
+}
+
+
+/* ========================================================================= */
+/* tape file functions                                                       */
+/* ========================================================================= */
+
+static void setTapeInfoToDefaults()
+{
+  int i;
+
+  /* always start with reliable default values (empty tape) */
+  TapeErase();
+
+  /* default values (also for pre-1.2 tapes) with only the first player */
+  tape.player_participates[0] = TRUE;
+  for(i=1; i<MAX_PLAYERS; i++)
+    tape.player_participates[i] = FALSE;
+
+  /* at least one (default: the first) player participates in every tape */
+  tape.num_participating_players = 1;
+
+  tape.level_nr = level_nr;
+  tape.counter = 0;
+  tape.changed = FALSE;
+
+  tape.recording = FALSE;
+  tape.playing = FALSE;
+  tape.pausing = FALSE;
+}
+
+static int LoadTape_VERS(FILE *file, int chunk_size, struct TapeInfo *tape)
+{
+  tape->file_version = getFileVersion(file);
+  tape->game_version = getFileVersion(file);
+
+  return chunk_size;
+}
+
+static int LoadTape_HEAD(FILE *file, int chunk_size, struct TapeInfo *tape)
+{
+  int i;
+
+  tape->random_seed = getFile32BitBE(file);
+  tape->date        = getFile32BitBE(file);
+  tape->length      = getFile32BitBE(file);
+
+  /* read header fields that are new since version 1.2 */
+  if (tape->file_version >= FILE_VERSION_1_2)
+  {
+    byte store_participating_players = fgetc(file);
+    int engine_version;
+
+    /* since version 1.2, tapes store which players participate in the tape */
+    tape->num_participating_players = 0;
+    for(i=0; i<MAX_PLAYERS; i++)
     {
-      Error(ERR_RETURN, "wrong format of names file '%s'", filename);
-      fclose(file);
-      file = NULL;
+      tape->player_participates[i] = FALSE;
+
+      if (store_participating_players & (1 << i))
+      {
+	tape->player_participates[i] = TRUE;
+	tape->num_participating_players++;
+      }
     }
+
+    ReadUnusedBytesFromFile(file, TAPE_HEADER_UNUSED);
+
+    engine_version = getFileVersion(file);
+    if (engine_version > 0)
+      tape->engine_version = engine_version;
   }
 
-  if (!file)
+  return chunk_size;
+}
+
+static int LoadTape_INFO(FILE *file, int chunk_size, struct TapeInfo *tape)
+{
+  int level_identifier_size;
+  int i;
+
+  level_identifier_size = getFile16BitBE(file);
+
+  tape->level_identifier =
+    checked_realloc(tape->level_identifier, level_identifier_size);
+
+  for(i=0; i < level_identifier_size; i++)
+    tape->level_identifier[i] = fgetc(file);
+
+  tape->level_nr = getFile16BitBE(file);
+
+  chunk_size = 2 + level_identifier_size + 2;
+
+  return chunk_size;
+}
+
+static int LoadTape_BODY(FILE *file, int chunk_size, struct TapeInfo *tape)
+{
+  int i, j;
+  int chunk_size_expected =
+    (tape->num_participating_players + 1) * tape->length;
+
+  if (chunk_size_expected != chunk_size)
   {
-    *local_player = default_player;
-    level_nr = default_player.level_nr;
-    return;
+    ReadUnusedBytesFromFile(file, chunk_size);
+    return chunk_size_expected;
   }
 
-  while(1)
+  for(i=0; i<tape->length; i++)
   {
-    for(i=0;i<MAX_NAMELEN;i++)
-      new_player.login_name[i] = fgetc(file);
-    for(i=0;i<MAX_NAMELEN;i++)
-      new_player.alias_name[i] = fgetc(file);
-    new_player.handicap = fgetc(file);
-    new_player.setup = (fgetc(file)<<8) | fgetc(file);
-    new_player.leveldir_nr = fgetc(file);
-    if (!version_10_file)
+    if (i >= MAX_TAPELEN)
+      break;
+
+    for(j=0; j<MAX_PLAYERS; j++)
     {
-      new_player.level_nr = fgetc(file);
-      for(i=0;i<10;i++)		/* currently unused bytes */
-	fgetc(file);
+      tape->pos[i].action[j] = MV_NO_MOVING;
+
+      if (tape->player_participates[j])
+	tape->pos[i].action[j] = fgetc(file);
     }
-    else
-      new_player.level_nr = new_player.handicap;
 
-    if (feof(file))		/* Spieler noch nicht in Liste enthalten */
+    tape->pos[i].delay = fgetc(file);
+
+    if (tape->file_version == FILE_VERSION_1_0)
     {
-      new_player = default_player;
+      /* eliminate possible diagonal moves in old tapes */
+      /* this is only for backward compatibility */
 
-      fclose(file);
-      if (!(file = fopen(filename,"a")))
-	Error(ERR_RETURN, "cannot append new player to names file '%s'",
-	      filename);
-      else
+      byte joy_dir[4] = { JOY_LEFT, JOY_RIGHT, JOY_UP, JOY_DOWN };
+      byte action = tape->pos[i].action[0];
+      int k, num_moves = 0;
+
+      for (k=0; k<4; k++)
       {
-	for(i=0;i<MAX_NAMELEN;i++)
-	  fputc(new_player.login_name[i],file);
-	for(i=0;i<MAX_NAMELEN;i++)
-	  fputc(new_player.alias_name[i],file);
-	fputc(new_player.handicap,file);
-	fputc(new_player.setup / 256,file);
-	fputc(new_player.setup % 256,file);
-	fputc(new_player.leveldir_nr,file);
-	if (!version_10_file)
+	if (action & joy_dir[k])
 	{
-	  fputc(new_player.level_nr,file);
-	  for(i=0;i<10;i++)	/* currently unused bytes */
-	    fputc(0,file);
+	  tape->pos[i + num_moves].action[0] = joy_dir[k];
+	  if (num_moves > 0)
+	    tape->pos[i + num_moves].delay = 0;
+	  num_moves++;
 	}
       }
+
+      if (num_moves > 1)
+      {
+	num_moves--;
+	i += num_moves;
+	tape->length += num_moves;
+      }
+    }
+    else if (tape->file_version < FILE_VERSION_2_0)
+    {
+      /* convert pre-2.0 tapes to new tape format */
+
+      if (tape->pos[i].delay > 1)
+      {
+	/* action part */
+	tape->pos[i + 1] = tape->pos[i];
+	tape->pos[i + 1].delay = 1;
+
+	/* delay part */
+	for(j=0; j<MAX_PLAYERS; j++)
+	  tape->pos[i].action[j] = MV_NO_MOVING;
+	tape->pos[i].delay--;
+
+	i++;
+	tape->length++;
+      }
+    }
+
+    if (feof(file))
       break;
+  }
+
+  if (i != tape->length)
+    chunk_size = (tape->num_participating_players + 1) * i;
+
+  return chunk_size;
+}
+
+void LoadTapeFromFilename(char *filename)
+{
+  char cookie[MAX_LINE_LEN];
+  char chunk_name[CHUNK_ID_LEN + 1];
+  FILE *file;
+  int chunk_size;
+
+  /* always start with reliable default values */
+  setTapeInfoToDefaults();
+
+  if (!(file = fopen(filename, MODE_READ)))
+    return;
+
+  getFileChunkBE(file, chunk_name, NULL);
+  if (strcmp(chunk_name, "RND1") == 0)
+  {
+    getFile32BitBE(file);		/* not used */
+
+    getFileChunkBE(file, chunk_name, NULL);
+    if (strcmp(chunk_name, "TAPE") != 0)
+    {
+      Error(ERR_WARN, "unknown format of tape file '%s'", filename);
+      fclose(file);
+      return;
     }
-    else			/* prüfen, ob Spieler in Liste enthalten */
-      if (!strncmp(new_player.login_name,login_name,MAX_NAMELEN-1))
-	break;
   }
+  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 (mode==PLAYER_SETUP)
+    if (!checkCookieString(cookie, TAPE_COOKIE_TMPL))
+    {
+      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;
+    }
+
+    /* pre-2.0 tape files have no game version, so use file version here */
+    tape.game_version = tape.file_version;
+  }
+
+  if (tape.file_version < FILE_VERSION_1_2)
   {
-    *local_player = new_player;
-    if (local_player->leveldir_nr < num_leveldirs)
-      leveldir_nr = local_player->leveldir_nr;
-    else
-      leveldir_nr = 0;
+    /* tape files from versions before 1.2.0 without chunk structure */
+    LoadTape_HEAD(file, TAPE_HEADER_SIZE, &tape);
+    LoadTape_BODY(file, 2 * tape.length,  &tape);
   }
   else
   {
-    local_player->handicap = new_player.handicap;
-    local_player->level_nr = new_player.level_nr;
+    static struct
+    {
+      char *name;
+      int size;
+      int (*loader)(FILE *, int, struct TapeInfo *);
+    }
+    chunk_info[] =
+    {
+      { "VERS", FILE_VERS_CHUNK_SIZE,	LoadTape_VERS },
+      { "HEAD", TAPE_HEADER_SIZE,	LoadTape_HEAD },
+      { "INFO", -1,			LoadTape_INFO },
+      { "BODY", -1,			LoadTape_BODY },
+      {  NULL,  0,			NULL }
+    };
+
+    while (getFileChunkBE(file, chunk_name, &chunk_size))
+    {
+      int i = 0;
+
+      while (chunk_info[i].name != NULL &&
+	     strcmp(chunk_name, chunk_info[i].name) != 0)
+	i++;
+
+      if (chunk_info[i].name == NULL)
+      {
+	Error(ERR_WARN, "unknown chunk '%s' in tape file '%s'",
+	      chunk_name, filename);
+	ReadUnusedBytesFromFile(file, chunk_size);
+      }
+      else if (chunk_info[i].size != -1 &&
+	       chunk_info[i].size != chunk_size)
+      {
+	Error(ERR_WARN, "wrong size (%d) of chunk '%s' in tape file '%s'",
+	      chunk_size, chunk_name, filename);
+	ReadUnusedBytesFromFile(file, chunk_size);
+      }
+      else
+      {
+	/* call function to load this tape chunk */
+	int chunk_size_expected =
+	  (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
+	   information, so check them here */
+	if (chunk_size_expected != chunk_size)
+	{
+	  Error(ERR_WARN, "wrong size (%d) of chunk '%s' in tape file '%s'",
+		chunk_size, chunk_name, filename);
+	}
+      }
+    }
   }
 
-  level_nr = local_player->level_nr;
+  fclose(file);
 
-  if (file)
-    fclose(file);
+  tape.length_seconds = GetTapeLength();
+
+#if 0
+  printf("tape version: %d\n", tape.game_version);
+#endif
 }
 
-void SaveLevel(int level_nr)
+void LoadTape(int level_nr)
 {
-  int i,x,y;
-  char filename[MAX_FILENAME_LEN];
-  FILE *file;
+  char *filename = getTapeFilename(level_nr);
+
+  LoadTapeFromFilename(filename);
+}
+
+static void SaveTape_VERS(FILE *file, struct TapeInfo *tape)
+{
+  putFileVersion(file, tape->file_version);
+  putFileVersion(file, tape->game_version);
+}
+
+static void SaveTape_HEAD(FILE *file, struct TapeInfo *tape)
+{
+  int i;
+  byte store_participating_players = 0;
+
+  /* set bits for participating players for compact storage */
+  for(i=0; i<MAX_PLAYERS; i++)
+    if (tape->player_participates[i])
+      store_participating_players |= (1 << i);
+
+  putFile32BitBE(file, tape->random_seed);
+  putFile32BitBE(file, tape->date);
+  putFile32BitBE(file, tape->length);
+
+  fputc(store_participating_players, file);
+
+  /* unused bytes not at the end here for 4-byte alignment of engine_version */
+  WriteUnusedBytesToFile(file, TAPE_HEADER_UNUSED);
+
+  putFileVersion(file, tape->engine_version);
+}
+
+static void SaveTape_INFO(FILE *file, struct TapeInfo *tape)
+{
+  int level_identifier_size = strlen(tape->level_identifier) + 1;
+  int i;
+
+  putFile16BitBE(file, level_identifier_size);
 
-  sprintf(filename,"%s/%s/%d",
-	  level_directory,leveldir[leveldir_nr].filename,level_nr);
+  for(i=0; i < level_identifier_size; i++)
+    fputc(tape->level_identifier[i], file);
 
-  if (!(file=fopen(filename,"w")))
-  {
-    Error(ERR_RETURN, "cannot save level file '%s'", filename);
-    return;
-  }
+  putFile16BitBE(file, tape->level_nr);
+}
 
-  fputs(LEVEL_COOKIE,file);		/* Formatkennung */
-  fputc(0x0a,file);
-
-  fputc(level.fieldx,file);
-  fputc(level.fieldy,file);
-  fputc(level.time / 256,file);
-  fputc(level.time % 256,file);
-  fputc(level.edelsteine / 256,file);
-  fputc(level.edelsteine % 256,file);
-
-  for(i=0;i<MAX_LEVNAMLEN;i++)
-    fputc(level.name[i],file);
-  for(i=0;i<MAX_LEVSCORE_ENTRIES;i++)
-    fputc(level.score[i],file);
-  for(i=0;i<4;i++)
-    for(y=0;y<3;y++)
-      for(x=0;x<3;x++)
-	fputc(level.mampfer_inhalt[i][x][y],file);
-  fputc(level.tempo_amoebe,file);
-  fputc(level.dauer_sieb,file);
-  fputc(level.dauer_ablenk,file);
-  fputc(level.amoebe_inhalt,file);
-
-  for(i=0;i<NUM_FREE_LVHD_BYTES;i++)	/* Rest frei / Headergröße 80 Bytes */
-    fputc(0,file);
-
-  for(y=0;y<lev_fieldy;y++) 
-    for(x=0;x<lev_fieldx;x++) 
-      fputc(Ur[x][y],file);
+static void SaveTape_BODY(FILE *file, struct TapeInfo *tape)
+{
+  int i, j;
 
-  fclose(file);
+  for(i=0; i<tape->length; i++)
+  {
+    for(j=0; j<MAX_PLAYERS; j++)
+      if (tape->player_participates[j])
+	fputc(tape->pos[i].action[j], file);
 
-  chmod(filename, LEVEL_PERMS);
+    fputc(tape->pos[i].delay, file);
+  }
 }
 
-void SaveLevelTape(int level_nr)
+void SaveTape(int level_nr)
 {
-  int i;
-  char filename[MAX_FILENAME_LEN];
+  char *filename = getTapeFilename(level_nr);
   FILE *file;
   boolean new_tape = TRUE;
+  int num_participating_players = 0;
+  int info_chunk_size;
+  int body_chunk_size;
+  int i;
 
-#ifndef MSDOS
-  sprintf(filename,"%s/%s/%d.tape",
-	  level_directory,leveldir[leveldir_nr].filename,level_nr);
-#else
-  sprintf(filename,"%s/%s/%d.tap",
-	  level_directory,leveldir[leveldir_nr].filename,level_nr);
-#endif
+  InitTapeDirectory(leveldir_current->filename);
 
-  /* Testen, ob bereits eine Aufnahme existiert */
-  if ((file=fopen(filename,"r")))
+  /* if a tape still exists, ask to overwrite it */
+  if (access(filename, F_OK) == 0)
   {
     new_tape = FALSE;
-    fclose(file);
-
-    if (!Request("Replace old tape ?",REQ_ASK))
+    if (!Request("Replace old tape ?", REQ_ASK))
       return;
   }
 
-  if (!(file=fopen(filename,"w")))
+  if (!(file = fopen(filename, MODE_WRITE)))
   {
-    Error(ERR_RETURN, "cannot save level recording file '%s'", filename);
+    Error(ERR_WARN, "cannot save level recording file '%s'", filename);
     return;
   }
 
-  fputs(LEVELREC_COOKIE,file);		/* Formatkennung */
-  fputc(0x0a,file);
+  tape.file_version = FILE_VERSION_ACTUAL;
+  tape.game_version = GAME_VERSION_ACTUAL;
 
-  fputc((tape.random_seed >> 24) & 0xff,file);
-  fputc((tape.random_seed >> 16) & 0xff,file);
-  fputc((tape.random_seed >>  8) & 0xff,file);
-  fputc((tape.random_seed >>  0) & 0xff,file);
+  /* count number of participating players  */
+  for(i=0; i<MAX_PLAYERS; i++)
+    if (tape.player_participates[i])
+      num_participating_players++;
 
-  fputc((tape.date >>  24) & 0xff,file);
-  fputc((tape.date >>  16) & 0xff,file);
-  fputc((tape.date >>   8) & 0xff,file);
-  fputc((tape.date >>   0) & 0xff,file);
+  info_chunk_size = 2 + (strlen(tape.level_identifier) + 1) + 2;
+  body_chunk_size = (num_participating_players + 1) * tape.length;
 
-  fputc((tape.length >>  24) & 0xff,file);
-  fputc((tape.length >>  16) & 0xff,file);
-  fputc((tape.length >>   8) & 0xff,file);
-  fputc((tape.length >>   0) & 0xff,file);
+  putFileChunkBE(file, "RND1", CHUNK_SIZE_UNDEFINED);
+  putFileChunkBE(file, "TAPE", CHUNK_SIZE_NONE);
 
-  for(i=0;i<tape.length;i++)
-  {
-    int j;
+  putFileChunkBE(file, "VERS", FILE_VERS_CHUNK_SIZE);
+  SaveTape_VERS(file, &tape);
 
-    for(j=0; j<MAX_PLAYERS; j++)
-      fputc(tape.pos[i].action[j],file);
+  putFileChunkBE(file, "HEAD", TAPE_HEADER_SIZE);
+  SaveTape_HEAD(file, &tape);
 
-    fputc(tape.pos[i].delay,file);
-  }
+  putFileChunkBE(file, "INFO", info_chunk_size);
+  SaveTape_INFO(file, &tape);
+
+  putFileChunkBE(file, "BODY", body_chunk_size);
+  SaveTape_BODY(file, &tape);
 
   fclose(file);
 
-  chmod(filename, LEVREC_PERMS);
+  SetFilePermissions(filename, PERMS_PRIVATE);
 
   tape.changed = FALSE;
 
   if (new_tape)
-    Request("tape saved !",REQ_CONFIRM);
+    Request("tape saved !", REQ_CONFIRM);
 }
 
-void SaveScore(int level_nr)
+void DumpTape(struct TapeInfo *tape)
 {
-  int i,j;
-  char filename[MAX_FILENAME_LEN];
-  FILE *file;
-
-  sprintf(filename,"%s/%s/%s",
-	  level_directory,leveldir[leveldir_nr].filename,SCORE_FILENAME);
+  int i, j;
 
-  if (!(file=fopen(filename,"r+")))
+  if (TAPE_IS_EMPTY(*tape))
   {
-    Error(ERR_RETURN, "cannot save score for level %d", level_nr);
+    Error(ERR_WARN, "no tape available for level %d", tape->level_nr);
     return;
   }
 
-  fseek(file,
-	SCORE_COOKIE_LEN-1+level_nr*(MAX_SCORE_ENTRIES*(MAX_NAMELEN+2)),
-	SEEK_SET);
-  for(i=0;i<MAX_SCORE_ENTRIES;i++)
-  {
-    for(j=0;j<MAX_NAMELEN;j++)
-      fputc(highscore[i].Name[j],file);
-    fputc(highscore[i].Score / 256,file);
-    fputc(highscore[i].Score % 256,file);
-  }
-  fclose(file);
-}
-
-void SavePlayerInfo(int mode)
-{
-  int i;
-  char filename[MAX_FILENAME_LEN];
-  char cookie[MAX_FILENAME_LEN];
-  FILE *file;
-  struct PlayerInfo default_player;
-  int version_10_file = FALSE;
-
+  printf_line("-", 79);
+  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);
 
-
-  if (mode == PLAYER_SETUP)
-    SaveSetup();
-
-
-
-  if (mode == PLAYER_LEVEL)
-    sprintf(filename,"%s/%s/%s",
-	    level_directory,leveldir[leveldir_nr].filename,NAMES_FILENAME);
-  else
-    sprintf(filename,"%s/%s",CONFIG_PATH,NAMES_FILENAME);
-
-  if (!(file = fopen(filename,"r+")))
+  for(i=0; i<tape->length; i++)
   {
-    Error(ERR_RETURN, "cannot save player information to file '%s'", filename);
-    return;
-  }
+    if (i >= MAX_TAPELEN)
+      break;
 
-  fgets(cookie,NAMES_COOKIE_LEN,file);
-  if (!strcmp(cookie,NAMES_COOKIE_10))	/* altes Format? */
-    version_10_file = TRUE;
-  else if (strcmp(cookie,NAMES_COOKIE))	/* ungültiges Format? */
-  {
-    Error(ERR_RETURN, "wrong format of names file '%s'", filename);
-    fclose(file);
-    return;
-  }
+    printf("%03d: ", i);
 
-  while(1)
-  {
-    for(i=0;i<MAX_NAMELEN;i++)
-      default_player.login_name[i] = fgetc(file);
-    for(i=0;i<MAX_NAMELEN;i++)
-      default_player.alias_name[i] = fgetc(file);
-    default_player.handicap = fgetc(file);
-    default_player.setup = (fgetc(file)<<8) | fgetc(file);
-    default_player.leveldir_nr = fgetc(file);
-    if (!version_10_file)
+    for(j=0; j<MAX_PLAYERS; j++)
     {
-      default_player.level_nr = fgetc(file);
-      for(i=0;i<10;i++)		/* currently unused bytes */
-	fgetc(file);
-    }
-    else
-      default_player.level_nr = default_player.handicap;
-
-    if (feof(file))		/* Spieler noch nicht in Liste enthalten */
-      break;
-    else			/* prüfen, ob Spieler in Liste enthalten */
-      if (!strncmp(default_player.login_name,
-		   local_player->login_name, MAX_NAMELEN-1))
+      if (tape->player_participates[j])
       {
-	fseek(file,-(2*MAX_NAMELEN+1+2+1+(version_10_file ? 0 : 11)),SEEK_CUR);
-	break;
+	int action = tape->pos[i].action[j];
+
+	printf("%d:%02x ", j, action);
+	printf("[%c%c%c%c|%c%c] - ",
+	       (action & JOY_LEFT ? '<' : ' '),
+	       (action & JOY_RIGHT ? '>' : ' '),
+	       (action & JOY_UP ? '^' : ' '),
+	       (action & JOY_DOWN ? 'v' : ' '),
+	       (action & JOY_BUTTON_1 ? '1' : ' '),
+	       (action & JOY_BUTTON_2 ? '2' : ' '));
       }
-  }
+    }
 
-  local_player->level_nr = level_nr;
-
-  for(i=0;i<MAX_NAMELEN;i++)
-    fputc(local_player->login_name[i],file);
-  for(i=0;i<MAX_NAMELEN;i++)
-    fputc(local_player->alias_name[i],file);
-  fputc(local_player->handicap,file);
-  fputc(local_player->setup / 256,file);
-  fputc(local_player->setup % 256,file);
-  fputc(local_player->leveldir_nr,file);
-  if (!version_10_file)
-  {
-    fputc(local_player->level_nr,file);
-    for(i=0;i<10;i++)		/* currently unused bytes */
-      fputc(0,file);
+    printf("(%03d)\n", tape->pos[i].delay);
   }
 
-  fclose(file);
+  printf_line("-", 79);
 }
 
-void LoadJoystickData()
+
+/* ========================================================================= */
+/* score file functions                                                      */
+/* ========================================================================= */
+
+void LoadScore(int level_nr)
 {
   int i;
-  char cookie[256];
+  char *filename = getScoreFilename(level_nr);
+  char cookie[MAX_LINE_LEN];
+  char line[MAX_LINE_LEN];
+  char *line_ptr;
   FILE *file;
 
-  if (joystick_status==JOYSTICK_OFF)
-    return;
+  /* always start with reliable default values */
+  for(i=0; i<MAX_SCORE_ENTRIES; i++)
+  {
+    strcpy(highscore[i].Name, EMPTY_PLAYER_NAME);
+    highscore[i].Score = 0;
+  }
 
-#ifndef MSDOS
-  if (!(file=fopen(JOYDAT_FILE,"r")))
+  if (!(file = fopen(filename, MODE_READ)))
     return;
 
-  fscanf(file,"%s",cookie);
-  if (strcmp(cookie,JOYSTICK_COOKIE))	/* ungültiges Format? */
+  /* check file identifier */
+  fgets(cookie, MAX_LINE_LEN, file);
+  if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n')
+    cookie[strlen(cookie) - 1] = '\0';
+
+  if (!checkCookieString(cookie, SCORE_COOKIE))
   {
-    Error(ERR_RETURN, "wrong format of joystick file '%s'", JOYDAT_FILE);
+    Error(ERR_WARN, "unknown format of score file '%s'", filename);
     fclose(file);
     return;
   }
 
-  for(i=0;i<2;i++)
+  for(i=0; i<MAX_SCORE_ENTRIES; i++)
   {
-    fscanf(file,"%s",cookie);
-    fscanf(file, "%d %d %d \n",
-	   &joystick[i].xleft, &joystick[i].xmiddle, &joystick[i].xright);
-    fscanf(file, "%d %d %d \n",
-	   &joystick[i].yupper, &joystick[i].ymiddle, &joystick[i].ylower);
+    fscanf(file, "%d", &highscore[i].Score);
+    fgets(line, MAX_LINE_LEN, file);
+
+    if (line[strlen(line) - 1] == '\n')
+      line[strlen(line) - 1] = '\0';
+
+    for (line_ptr = line; *line_ptr; line_ptr++)
+    {
+      if (*line_ptr != ' ' && *line_ptr != '\t' && *line_ptr != '\0')
+      {
+	strncpy(highscore[i].Name, line_ptr, MAX_PLAYER_NAME_LEN);
+	highscore[i].Name[MAX_PLAYER_NAME_LEN] = '\0';
+	break;
+      }
+    }
   }
-  fclose(file);
 
-  CheckJoystickData();
-#else
-  load_joystick_data(JOYDAT_FILE);
-#endif
+  fclose(file);
 }
 
-void SaveJoystickData()
+void SaveScore(int level_nr)
 {
   int i;
+  char *filename = getScoreFilename(level_nr);
   FILE *file;
 
-  if (joystick_status==JOYSTICK_OFF)
-    return;
-
-#ifndef MSDOS
-  CheckJoystickData();
+  InitScoreDirectory(leveldir_current->filename);
 
-  if (!(file=fopen(JOYDAT_FILE,"w")))
+  if (!(file = fopen(filename, MODE_WRITE)))
   {
-    Error(ERR_RETURN, "cannot save joystick calibration data to file '%s'",
-	  JOYDAT_FILE);
+    Error(ERR_WARN, "cannot save score for level %d", level_nr);
     return;
   }
 
-  fprintf(file,"%s\n",JOYSTICK_COOKIE);	/* Formatkennung */
-  for(i=0;i<2;i++)
-  {
-    fprintf(file,"JOYSTICK_%d_DATA\n",i);
-    fprintf(file, "%d %d %d \n",
-	    joystick[i].xleft, joystick[i].xmiddle, joystick[i].xright);
-    fprintf(file, "%d %d %d \n",
-	    joystick[i].yupper, joystick[i].ymiddle, joystick[i].ylower);
-  }
-  fclose(file);
+  fprintf(file, "%s\n\n", SCORE_COOKIE);
 
-  chmod(JOYDAT_FILE, JOYDAT_PERMS);
-#else
-  save_joystick_data(JOYDAT_FILE);
-#endif
+  for(i=0; i<MAX_SCORE_ENTRIES; i++)
+    fprintf(file, "%d %s\n", highscore[i].Score, highscore[i].Name);
+
+  fclose(file);
 
+  SetFilePermissions(filename, PERMS_PUBLIC);
 }
 
-/* ------------------------------------------------------------------------- */
-/* new setup functions                                                       */
-/* ------------------------------------------------------------------------- */
-
-#define SETUP_TOKEN_SOUND		0
-#define SETUP_TOKEN_SOUND_LOOPS		1
-#define SETUP_TOKEN_SOUND_MUSIC		2
-#define SETUP_TOKEN_SOUND_SIMPLE	3
-#define SETUP_TOKEN_TOONS		4
-#define SETUP_TOKEN_DIRECT_DRAW		5
-#define SETUP_TOKEN_SCROLL_DELAY	6
-#define SETUP_TOKEN_SOFT_SCROLLING	7
-#define SETUP_TOKEN_FADING		8
-#define SETUP_TOKEN_AUTORECORD		9
-#define SETUP_TOKEN_QUICK_DOORS		10
-#define SETUP_TOKEN_USE_JOYSTICK	11
-#define SETUP_TOKEN_JOYSTICK_NR		12
-#define SETUP_TOKEN_JOY_SNAP		13
-#define SETUP_TOKEN_JOY_BOMB		14
-#define SETUP_TOKEN_KEY_LEFT		15
-#define SETUP_TOKEN_KEY_RIGHT		16
-#define SETUP_TOKEN_KEY_UP		17
-#define SETUP_TOKEN_KEY_DOWN		18
-#define SETUP_TOKEN_KEY_SNAP		19
-#define SETUP_TOKEN_KEY_BOMB		20
-
-#define NUM_SETUP_TOKENS		21
-
-#define SETUP_TOKEN_PLAYER_PREFIX	"player_"
-
-static struct
-{
-  char *token, *value_true, *value_false;
-} setup_info[] =
+
+/* ========================================================================= */
+/* setup file functions                                                      */
+/* ========================================================================= */
+
+#define TOKEN_STR_PLAYER_PREFIX			"player_"
+
+/* global setup */
+#define SETUP_TOKEN_PLAYER_NAME			0
+#define SETUP_TOKEN_SOUND			1
+#define SETUP_TOKEN_SOUND_LOOPS			2
+#define SETUP_TOKEN_SOUND_MUSIC			3
+#define SETUP_TOKEN_SOUND_SIMPLE		4
+#define SETUP_TOKEN_TOONS			5
+#define SETUP_TOKEN_SCROLL_DELAY		6
+#define SETUP_TOKEN_SOFT_SCROLLING		7
+#define SETUP_TOKEN_FADING			8
+#define SETUP_TOKEN_AUTORECORD			9
+#define SETUP_TOKEN_QUICK_DOORS			10
+#define SETUP_TOKEN_TEAM_MODE			11
+#define SETUP_TOKEN_HANDICAP			12
+#define SETUP_TOKEN_TIME_LIMIT			13
+#define SETUP_TOKEN_FULLSCREEN			14
+#define SETUP_TOKEN_ASK_ON_ESCAPE		15
+#define SETUP_TOKEN_GRAPHICS_SET		16
+#define SETUP_TOKEN_SOUNDS_SET			17
+#define SETUP_TOKEN_MUSIC_SET			18
+#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS	19
+#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS	20
+#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC	21
+
+#define NUM_GLOBAL_SETUP_TOKENS			22
+
+/* editor setup */
+#define SETUP_TOKEN_EDITOR_EL_BOULDERDASH	0
+#define SETUP_TOKEN_EDITOR_EL_EMERALD_MINE	1
+#define SETUP_TOKEN_EDITOR_EL_MORE		2
+#define SETUP_TOKEN_EDITOR_EL_SOKOBAN		3
+#define SETUP_TOKEN_EDITOR_EL_SUPAPLEX		4
+#define SETUP_TOKEN_EDITOR_EL_DIAMOND_CAVES	5
+#define SETUP_TOKEN_EDITOR_EL_DX_BOULDERDASH	6
+#define SETUP_TOKEN_EDITOR_EL_CHARS		7
+#define SETUP_TOKEN_EDITOR_EL_CUSTOM		8
+
+#define NUM_EDITOR_SETUP_TOKENS			9
+
+/* shortcut setup */
+#define SETUP_TOKEN_SHORTCUT_SAVE_GAME		0
+#define SETUP_TOKEN_SHORTCUT_LOAD_GAME		1
+#define SETUP_TOKEN_SHORTCUT_TOGGLE_PAUSE	2
+
+#define NUM_SHORTCUT_SETUP_TOKENS		3
+
+/* player setup */
+#define SETUP_TOKEN_PLAYER_USE_JOYSTICK		0
+#define SETUP_TOKEN_PLAYER_JOY_DEVICE_NAME	1
+#define SETUP_TOKEN_PLAYER_JOY_XLEFT		2
+#define SETUP_TOKEN_PLAYER_JOY_XMIDDLE		3
+#define SETUP_TOKEN_PLAYER_JOY_XRIGHT		4
+#define SETUP_TOKEN_PLAYER_JOY_YUPPER		5
+#define SETUP_TOKEN_PLAYER_JOY_YMIDDLE		6
+#define SETUP_TOKEN_PLAYER_JOY_YLOWER		7
+#define SETUP_TOKEN_PLAYER_JOY_SNAP		8
+#define SETUP_TOKEN_PLAYER_JOY_BOMB		9
+#define SETUP_TOKEN_PLAYER_KEY_LEFT		10
+#define SETUP_TOKEN_PLAYER_KEY_RIGHT		11
+#define SETUP_TOKEN_PLAYER_KEY_UP		12
+#define SETUP_TOKEN_PLAYER_KEY_DOWN		13
+#define SETUP_TOKEN_PLAYER_KEY_SNAP		14
+#define SETUP_TOKEN_PLAYER_KEY_BOMB		15
+
+#define NUM_PLAYER_SETUP_TOKENS			16
+
+/* system setup */
+#define SETUP_TOKEN_SYSTEM_SDL_AUDIODRIVER	0
+#define SETUP_TOKEN_SYSTEM_AUDIO_FRAGMENT_SIZE	1
+
+#define NUM_SYSTEM_SETUP_TOKENS			2
+
+/* options setup */
+#define SETUP_TOKEN_OPTIONS_VERBOSE		0
+
+#define NUM_OPTIONS_SETUP_TOKENS		1
+
+
+static struct SetupInfo si;
+static struct SetupEditorInfo sei;
+static struct SetupShortcutInfo ssi;
+static struct SetupInputInfo sii;
+static struct SetupSystemInfo syi;
+static struct OptionInfo soi;
+
+static struct TokenInfo global_setup_tokens[] =
 {
-  { "sound",			"on", "off" },
-  { "repeating_sound_loops",	"on", "off" },
-  { "background_music",		"on", "off" },
-  { "simple_sound_effects",	"on", "off" },
-  { "toons",			"on", "off" },
-  { "double_buffering", 	"off", "on" },
-  { "scroll_delay",		"on", "off" },
-  { "soft_scrolling",		"on", "off" },
-  { "screen_fading",		"on", "off" },
-  { "automatic_tape_recording",	"on", "off" },
-  { "quick_doors",		"on", "off" },
-
-  /* for each player: */
-  { ".use_joystick",		"true", "false" },
-  { ".joystick_device",		"second", "first" },
-  { ".joy.snap_field",		"", "" },
-  { ".joy.place_bomb",		"", "" },
-  { ".key.move_left",		"", "" },
-  { ".key.move_right",		"", "" },
-  { ".key.move_up",		"", "" },
-  { ".key.move_down",		"", "" },
-  { ".key.snap_field",		"", "" },
-  { ".key.place_bomb",		"", "" }
+  { TYPE_STRING, &si.player_name,	"player_name"			},
+  { TYPE_SWITCH, &si.sound,		"sound"				},
+  { TYPE_SWITCH, &si.sound_loops,	"repeating_sound_loops"		},
+  { TYPE_SWITCH, &si.sound_music,	"background_music"		},
+  { TYPE_SWITCH, &si.sound_simple,	"simple_sound_effects"		},
+  { TYPE_SWITCH, &si.toons,		"toons"				},
+  { TYPE_SWITCH, &si.scroll_delay,	"scroll_delay"			},
+  { TYPE_SWITCH, &si.soft_scrolling,	"soft_scrolling"		},
+  { TYPE_SWITCH, &si.fading,		"screen_fading"			},
+  { TYPE_SWITCH, &si.autorecord,	"automatic_tape_recording"	},
+  { TYPE_SWITCH, &si.quick_doors,	"quick_doors"			},
+  { TYPE_SWITCH, &si.team_mode,		"team_mode"			},
+  { TYPE_SWITCH, &si.handicap,		"handicap"			},
+  { TYPE_SWITCH, &si.time_limit,	"time_limit"			},
+  { TYPE_SWITCH, &si.fullscreen,	"fullscreen"			},
+  { TYPE_SWITCH, &si.ask_on_escape,	"ask_on_escape"			},
+  { TYPE_STRING, &si.graphics_set,	"graphics_set"			},
+  { TYPE_STRING, &si.sounds_set,	"sounds_set"			},
+  { TYPE_STRING, &si.music_set,		"music_set"			},
+  { TYPE_SWITCH, &si.override_level_graphics, "override_level_graphics"	},
+  { TYPE_SWITCH, &si.override_level_sounds,   "override_level_sounds"	},
+  { TYPE_SWITCH, &si.override_level_music,    "override_level_music"	},
 };
 
-static char *string_tolower(char *s)
+static struct TokenInfo editor_setup_tokens[] =
 {
-  static char s_lower[100];
-  int i;
-
-  if (strlen(s) >= 100)
-    return s;
-
-  strcpy(s_lower, s);
-
-  for (i=0; i<strlen(s_lower); i++)
-    s_lower[i] = tolower(s_lower[i]);
-
-  return s_lower;
-}
+  { TYPE_SWITCH, &sei.el_boulderdash,	"editor.el_boulderdash"		},
+  { TYPE_SWITCH, &sei.el_emerald_mine,	"editor.el_emerald_mine"	},
+  { TYPE_SWITCH, &sei.el_more,		"editor.el_more"		},
+  { TYPE_SWITCH, &sei.el_sokoban,	"editor.el_sokoban"		},
+  { TYPE_SWITCH, &sei.el_supaplex,	"editor.el_supaplex"		},
+  { TYPE_SWITCH, &sei.el_diamond_caves,	"editor.el_diamond_caves"	},
+  { TYPE_SWITCH, &sei.el_dx_boulderdash,"editor.el_dx_boulderdash"	},
+  { TYPE_SWITCH, &sei.el_chars,		"editor.el_chars"		},
+  { TYPE_SWITCH, &sei.el_custom,	"editor.el_custom"		},
+};
 
-static int get_string_integer_value(char *s)
+static struct TokenInfo shortcut_setup_tokens[] =
 {
-  static char *number_text[][3] =
-  {
-    { "0", "zero", "null", },
-    { "1", "one", "first" },
-    { "2", "two", "second" },
-    { "3", "three", "third" },
-    { "4", "four", "fourth" },
-    { "5", "five", "fifth" },
-    { "6", "six", "sixth" },
-    { "7", "seven", "seventh" },
-    { "8", "eight", "eighth" },
-    { "9", "nine", "ninth" },
-    { "10", "ten", "tenth" },
-    { "11", "eleven", "eleventh" },
-    { "12", "twelve", "twelfth" },
-  };
-
-  int i, j;
-
-  for (i=0; i<13; i++)
-    for (j=0; j<3; j++)
-      if (strcmp(string_tolower(s), number_text[i][j]) == 0)
-	return i;
-
-  return -1;
-}
+  { TYPE_KEY_X11, &ssi.save_game,	"shortcut.save_game"		},
+  { TYPE_KEY_X11, &ssi.load_game,	"shortcut.load_game"		},
+  { TYPE_KEY_X11, &ssi.toggle_pause,	"shortcut.toggle_pause"		}
+};
 
-static boolean get_string_boolean_value(char *s)
+static struct TokenInfo player_setup_tokens[] =
 {
-  if (strcmp(string_tolower(s), "true") == 0 ||
-      strcmp(string_tolower(s), "yes") == 0 ||
-      strcmp(string_tolower(s), "on") == 0 ||
-      get_string_integer_value(s) == 1)
-    return TRUE;
-  else
-    return FALSE;
-}
+  { TYPE_BOOLEAN, &sii.use_joystick,	".use_joystick"			},
+  { TYPE_STRING,  &sii.joy.device_name,	".joy.device_name"		},
+  { TYPE_INTEGER, &sii.joy.xleft,	".joy.xleft"			},
+  { TYPE_INTEGER, &sii.joy.xmiddle,	".joy.xmiddle"			},
+  { TYPE_INTEGER, &sii.joy.xright,	".joy.xright"			},
+  { TYPE_INTEGER, &sii.joy.yupper,	".joy.yupper"			},
+  { TYPE_INTEGER, &sii.joy.ymiddle,	".joy.ymiddle"			},
+  { TYPE_INTEGER, &sii.joy.ylower,	".joy.ylower"			},
+  { TYPE_INTEGER, &sii.joy.snap,	".joy.snap_field"		},
+  { TYPE_INTEGER, &sii.joy.bomb,	".joy.place_bomb"		},
+  { TYPE_KEY_X11, &sii.key.left,	".key.move_left"		},
+  { TYPE_KEY_X11, &sii.key.right,	".key.move_right"		},
+  { TYPE_KEY_X11, &sii.key.up,		".key.move_up"			},
+  { TYPE_KEY_X11, &sii.key.down,	".key.move_down"		},
+  { TYPE_KEY_X11, &sii.key.snap,	".key.snap_field"		},
+  { TYPE_KEY_X11, &sii.key.bomb,	".key.place_bomb"		}
+};
 
-static char *getSetupToken(int token_nr)
+static struct TokenInfo system_setup_tokens[] =
 {
-  return setup_info[token_nr].token;
-}
+  { TYPE_STRING,  &syi.sdl_audiodriver,	"system.sdl_audiodriver"	},
+  { TYPE_INTEGER, &syi.audio_fragment_size,"system.audio_fragment_size"	}
+};
 
-static char *getSetupValue(int token_nr, boolean token_value)
+static struct TokenInfo options_setup_tokens[] =
 {
-  if (token_value == TRUE)
-    return setup_info[token_nr].value_true;
-  else
-    return setup_info[token_nr].value_false;
-}
+  { TYPE_BOOLEAN, &soi.verbose,		"options.verbose"		}
+};
 
-static char *getSetupEntry(char *prefix, int token_nr, int token_value)
+static char *get_corrected_login_name(char *login_name)
 {
-  int i;
-  static char entry[80];
+  /* needed because player name must be a fixed length string */
+  char *login_name_new = checked_malloc(MAX_PLAYER_NAME_LEN + 1);
 
-  sprintf(entry, "%s%s:", prefix, getSetupToken(token_nr));
-  for (i=strlen(entry); i<30; i++)
-    entry[i] = ' ';
-  entry[i] = '\0';
+  strncpy(login_name_new, login_name, MAX_PLAYER_NAME_LEN);
+  login_name_new[MAX_PLAYER_NAME_LEN] = '\0';
 
-  strcat(entry, getSetupValue(token_nr, token_value));
+  if (strlen(login_name) > MAX_PLAYER_NAME_LEN)		/* name has been cut */
+    if (strchr(login_name_new, ' '))
+      *strchr(login_name_new, ' ') = '\0';
 
-  return entry;
+  return login_name_new;
 }
 
-static char *getSetupEntryWithComment(char *prefix,int token_nr, KeySym keysym)
+static void setSetupInfoToDefaults(struct SetupInfo *si)
 {
   int i;
-  static char entry[80];
-  char *keyname = getKeyNameFromKeySym(keysym);
-
-  sprintf(entry, "%s%s:", prefix, getSetupToken(token_nr));
-  for (i=strlen(entry); i<30; i++)
-    entry[i] = ' ';
-  entry[i] = '\0';
-
-  strcat(entry, getX11KeyNameFromKeySym(keysym));
-  for (i=strlen(entry); i<50; i++)
-    entry[i] = ' ';
-  entry[i] = '\0';
-
-  /* add comment, if useful */
-  if (strcmp(keyname, "(undefined)") != 0 &&
-      strcmp(keyname, "(unknown)") != 0)
-  {
-    strcat(entry, "# ");
-    strcat(entry, keyname);
-  }
 
-  return entry;
-}
-
-static void freeSetupFileInfo(struct SetupFileInfo *setup_file_info)
-{
-  if (!setup_file_info)
-    return;
-
-  if (setup_file_info->token)
-    free(setup_file_info->token);
-  if (setup_file_info->value)
-    free(setup_file_info->value);
-  if (setup_file_info->next)
-    freeSetupFileInfo(setup_file_info->next);
-  free(setup_file_info);
-}
-
-static struct SetupFileInfo *newSetupFileInfo(char *token, char *value)
-{
-  struct SetupFileInfo *new = checked_malloc(sizeof(struct SetupFileInfo));
+  si->player_name = get_corrected_login_name(getLoginName());
+
+  si->sound = TRUE;
+  si->sound_loops = TRUE;
+  si->sound_music = TRUE;
+  si->sound_simple = TRUE;
+  si->toons = TRUE;
+  si->double_buffering = TRUE;
+  si->direct_draw = !si->double_buffering;
+  si->scroll_delay = TRUE;
+  si->soft_scrolling = TRUE;
+  si->fading = FALSE;
+  si->autorecord = TRUE;
+  si->quick_doors = FALSE;
+  si->team_mode = FALSE;
+  si->handicap = TRUE;
+  si->time_limit = TRUE;
+  si->fullscreen = FALSE;
+  si->ask_on_escape = TRUE;
+
+  si->graphics_set = getStringCopy(GRAPHICS_SUBDIR);
+  si->sounds_set = getStringCopy(SOUNDS_SUBDIR);
+  si->music_set = getStringCopy(MUSIC_SUBDIR);
+  si->override_level_graphics = FALSE;
+  si->override_level_sounds = FALSE;
+  si->override_level_music = FALSE;
+
+  si->editor.el_boulderdash = TRUE;
+  si->editor.el_emerald_mine = TRUE;
+  si->editor.el_more = TRUE;
+  si->editor.el_sokoban = TRUE;
+  si->editor.el_supaplex = TRUE;
+  si->editor.el_diamond_caves = TRUE;
+  si->editor.el_dx_boulderdash = TRUE;
+  si->editor.el_chars = TRUE;
+  si->editor.el_custom = TRUE;
+
+  si->shortcut.save_game = DEFAULT_KEY_SAVE_GAME;
+  si->shortcut.load_game = DEFAULT_KEY_LOAD_GAME;
+  si->shortcut.toggle_pause = DEFAULT_KEY_TOGGLE_PAUSE;
 
-  new->token = checked_malloc(strlen(token) + 1);
-  strcpy(new->token, token);
-
-  new->value = checked_malloc(strlen(value) + 1);
-  strcpy(new->value, value);
-
-  new->next = NULL;
-
-  return new;
-}
+  for (i=0; i<MAX_PLAYERS; i++)
+  {
+    si->input[i].use_joystick = FALSE;
+    si->input[i].joy.device_name=getStringCopy(getDeviceNameFromJoystickNr(i));
+    si->input[i].joy.xleft   = JOYSTICK_XLEFT;
+    si->input[i].joy.xmiddle = JOYSTICK_XMIDDLE;
+    si->input[i].joy.xright  = JOYSTICK_XRIGHT;
+    si->input[i].joy.yupper  = JOYSTICK_YUPPER;
+    si->input[i].joy.ymiddle = JOYSTICK_YMIDDLE;
+    si->input[i].joy.ylower  = JOYSTICK_YLOWER;
+    si->input[i].joy.snap  = (i == 0 ? JOY_BUTTON_1 : 0);
+    si->input[i].joy.bomb  = (i == 0 ? JOY_BUTTON_2 : 0);
+    si->input[i].key.left  = (i == 0 ? DEFAULT_KEY_LEFT  : KSYM_UNDEFINED);
+    si->input[i].key.right = (i == 0 ? DEFAULT_KEY_RIGHT : KSYM_UNDEFINED);
+    si->input[i].key.up    = (i == 0 ? DEFAULT_KEY_UP    : KSYM_UNDEFINED);
+    si->input[i].key.down  = (i == 0 ? DEFAULT_KEY_DOWN  : KSYM_UNDEFINED);
+    si->input[i].key.snap  = (i == 0 ? DEFAULT_KEY_SNAP  : KSYM_UNDEFINED);
+    si->input[i].key.bomb  = (i == 0 ? DEFAULT_KEY_BOMB  : KSYM_UNDEFINED);
+  }
 
-static char *lookupSetupFileValue(struct SetupFileInfo *setup_file_info,
-				  char *token)
-{
-  if (!setup_file_info)
-    return NULL;
+  si->system.sdl_audiodriver = getStringCopy(ARG_DEFAULT);
+  si->system.audio_fragment_size = DEFAULT_AUDIO_FRAGMENT_SIZE;
 
-  if (strcmp(setup_file_info->token, token) == 0)
-    return setup_file_info->value;
-  else
-    return lookupSetupFileValue(setup_file_info->next, token);
+  si->options.verbose = FALSE;
 }
 
-#ifdef DEBUG
-static void printSetupFileInfo(struct SetupFileInfo *setup_file_info)
+static void decodeSetupFileHash(SetupFileHash *setup_file_hash)
 {
-  if (!setup_file_info)
-    return;
-
-  printf("token: '%s'\n", setup_file_info->token);
-  printf("value: '%s'\n", setup_file_info->value);
-
-  printSetupFileInfo(setup_file_info->next);
-}
-#endif
+  int i, pnr;
 
-static void decodeSetupFileInfo(struct SetupFileInfo *setup_file_info)
-{
-  int i;
-  int token_nr = -1;
-  int player_nr = 0;
-  char *token;
-  char *token_value;
-  int token_integer_value;
-  boolean token_boolean_value;
-  int token_player_prefix_len;
-
-  if (!setup_file_info)
+  if (!setup_file_hash)
     return;
 
-  token = setup_file_info->token;
-  token_value = setup_file_info->value;
-  token_integer_value = get_string_integer_value(token_value);
-  token_boolean_value = get_string_boolean_value(token_value);
-
-  token_player_prefix_len = strlen(SETUP_TOKEN_PLAYER_PREFIX);
-
-  if (strncmp(token, SETUP_TOKEN_PLAYER_PREFIX, token_player_prefix_len) == 0)
+  /* global setup */
+  si = setup;
+  for (i=0; i<NUM_GLOBAL_SETUP_TOKENS; i++)
+    setSetupInfo(global_setup_tokens, i,
+		 getHashEntry(setup_file_hash, global_setup_tokens[i].text));
+  setup = si;
+
+  /* editor setup */
+  sei = setup.editor;
+  for (i=0; i<NUM_EDITOR_SETUP_TOKENS; i++)
+    setSetupInfo(editor_setup_tokens, i,
+		 getHashEntry(setup_file_hash,editor_setup_tokens[i].text));
+  setup.editor = sei;
+
+  /* shortcut setup */
+  ssi = setup.shortcut;
+  for (i=0; i<NUM_SHORTCUT_SETUP_TOKENS; i++)
+    setSetupInfo(shortcut_setup_tokens, i,
+		 getHashEntry(setup_file_hash,shortcut_setup_tokens[i].text));
+  setup.shortcut = ssi;
+
+  /* player setup */
+  for (pnr=0; pnr<MAX_PLAYERS; pnr++)
   {
-    token += token_player_prefix_len;
+    char prefix[30];
 
-    if (*token >= '0' && *token <= '9')
-    {
-      player_nr = ((int)(*token - '0') - 1 + MAX_PLAYERS) % MAX_PLAYERS;
-      token++;
-    }
-  }
+    sprintf(prefix, "%s%d", TOKEN_STR_PLAYER_PREFIX, pnr + 1);
 
-  for (i=0; i<NUM_SETUP_TOKENS; i++)
-  {
-    if (strcmp(token, setup_info[i].token) == 0)
+    sii = setup.input[pnr];
+    for (i=0; i<NUM_PLAYER_SETUP_TOKENS; i++)
     {
-      token_nr = i;
-      break;
+      char full_token[100];
+
+      sprintf(full_token, "%s%s", prefix, player_setup_tokens[i].text);
+      setSetupInfo(player_setup_tokens, i,
+		   getHashEntry(setup_file_hash, full_token));
     }
+    setup.input[pnr] = sii;
   }
 
+  /* system setup */
+  syi = setup.system;
+  for (i=0; i<NUM_SYSTEM_SETUP_TOKENS; i++)
+    setSetupInfo(system_setup_tokens, i,
+		 getHashEntry(setup_file_hash, system_setup_tokens[i].text));
+  setup.system = syi;
+
+  /* options setup */
+  soi = setup.options;
+  for (i=0; i<NUM_OPTIONS_SETUP_TOKENS; i++)
+    setSetupInfo(options_setup_tokens, i,
+		 getHashEntry(setup_file_hash, options_setup_tokens[i].text));
+  setup.options = soi;
+}
 
+void LoadSetup()
+{
+  char *filename = getSetupFilename();
+  SetupFileHash *setup_file_hash = NULL;
 
-  /*
-  printf("token == '%s', token_integer_value == %d\n",
-	 token, token_integer_value);
+  /* always start with reliable default values */
+  setSetupInfoToDefaults(&setup);
 
+  setup_file_hash = loadSetupFileHash(filename);
 
-  printf("[player %d] token == '%s', token_value == '%s' (%ld)\n",
-	 player_nr, token, token_value,
-	 (unsigned long)getKeySymFromX11KeyName(token_value));
-  */
+  if (setup_file_hash)
+  {
+    char *player_name_new;
 
+    checkSetupFileHashIdentifier(setup_file_hash, getCookie("SETUP"));
+    decodeSetupFileHash(setup_file_hash);
 
+    setup.direct_draw = !setup.double_buffering;
 
-  switch (token_nr)
-  {
-    case SETUP_TOKEN_SOUND:
-      setup.sound_on = token_boolean_value;
-      break;
-    case SETUP_TOKEN_SOUND_LOOPS:
-      setup.sound_loops_on = token_boolean_value;
-      break;
-    case SETUP_TOKEN_SOUND_MUSIC:
-      setup.sound_music_on = token_boolean_value;
-      break;
-    case SETUP_TOKEN_SOUND_SIMPLE:
-      setup.sound_simple_on = token_boolean_value;
-      break;
-    case SETUP_TOKEN_TOONS:
-      setup.toons_on = token_boolean_value;
-      break;
-    case SETUP_TOKEN_DIRECT_DRAW:
-      setup.direct_draw_on = token_boolean_value;
-      break;
-    case SETUP_TOKEN_SCROLL_DELAY:
-      setup.scroll_delay_on = token_boolean_value;
-      break;
-    case SETUP_TOKEN_SOFT_SCROLLING:
-      setup.soft_scrolling_on = token_boolean_value;
-      break;
-    case SETUP_TOKEN_FADING:
-      setup.fading_on = token_boolean_value;
-      break;
-    case SETUP_TOKEN_AUTORECORD:
-      setup.autorecord_on = token_boolean_value;
-      break;
-    case SETUP_TOKEN_QUICK_DOORS:
-      setup.quick_doors = token_boolean_value;
-      break;
+    freeSetupFileHash(setup_file_hash);
 
-    case SETUP_TOKEN_USE_JOYSTICK:
-      setup.input[player_nr].use_joystick = token_boolean_value;
-      break;
-    case SETUP_TOKEN_JOYSTICK_NR:
-      if (token_integer_value < 0 || token_integer_value > 1)
-	token_integer_value = 1;
-      setup.input[player_nr].joystick_nr = token_integer_value - 1;
-      break;
-    case SETUP_TOKEN_JOY_SNAP:
-      setup.input[player_nr].joy.snap = getJoySymbolFromJoyName(token_value);
-      break;
-    case SETUP_TOKEN_JOY_BOMB    :
-      setup.input[player_nr].joy.bomb = getJoySymbolFromJoyName(token_value);
-      break;
-    case SETUP_TOKEN_KEY_LEFT:
-      setup.input[player_nr].key.left = getKeySymFromX11KeyName(token_value);
-      break;
-    case SETUP_TOKEN_KEY_RIGHT:
-      setup.input[player_nr].key.right = getKeySymFromX11KeyName(token_value);
-      break;
-    case SETUP_TOKEN_KEY_UP:
-      setup.input[player_nr].key.up = getKeySymFromX11KeyName(token_value);
-      break;
-    case SETUP_TOKEN_KEY_DOWN:
-      setup.input[player_nr].key.down = getKeySymFromX11KeyName(token_value);
-      break;
-    case SETUP_TOKEN_KEY_SNAP:
-      setup.input[player_nr].key.snap = getKeySymFromX11KeyName(token_value);
-      break;
-    case SETUP_TOKEN_KEY_BOMB:
-      setup.input[player_nr].key.bomb = getKeySymFromX11KeyName(token_value);
-      break;
-    default:
-      break;
+    /* needed to work around problems with fixed length strings */
+    player_name_new = get_corrected_login_name(setup.player_name);
+    free(setup.player_name);
+    setup.player_name = player_name_new;
   }
-
-  decodeSetupFileInfo(setup_file_info->next);
+  else
+    Error(ERR_WARN, "using default setup values");
 }
 
-void LoadSetup()
+void SaveSetup()
 {
-  int line_len;
-  char filename[MAX_FILENAME_LEN];
-  char line[MAX_LINE_LEN];
-  char *token, *value, *line_ptr;
-  struct SetupFileInfo *setup_file_info, **next_entry = &setup_file_info;
+  char *filename = getSetupFilename();
   FILE *file;
+  int i, pnr;
 
+  InitUserDataDirectory();
 
-
-  printf("LoadSetup\n");
-
-
-
-  sprintf(filename, "%s/%s", SETUP_PATH, SETUP_FILENAME);
-
-  if (!(file = fopen(filename, "r")))
+  if (!(file = fopen(filename, MODE_WRITE)))
   {
-    int i;
-
-    Error(ERR_RETURN, "cannot open setup file '%s'", filename);
-
-    /* use default values for setup */
-
-    setup.sound_on = TRUE;
-    setup.sound_loops_on = FALSE;
-    setup.sound_music_on = FALSE;
-    setup.sound_simple_on = FALSE;
-    setup.toons_on = TRUE;
-    setup.direct_draw_on = FALSE;
-    setup.scroll_delay_on = FALSE;
-    setup.soft_scrolling_on = TRUE;
-    setup.fading_on = FALSE;
-    setup.autorecord_on = FALSE;
-    setup.quick_doors = FALSE;
-
-    for (i=0; i<MAX_PLAYERS; i++)
-    {
-      setup.input[i].use_joystick = FALSE;
-      setup.input[i].joystick_nr = 0;
-      setup.input[i].joy.snap  = (i == 0 ? JOY_BUTTON_1 : 0);
-      setup.input[i].joy.bomb  = (i == 0 ? JOY_BUTTON_2 : 0);
-      setup.input[i].key.left  = (i == 0 ? DEFAULT_KEY_LEFT  : KEY_UNDEFINDED);
-      setup.input[i].key.right = (i == 0 ? DEFAULT_KEY_RIGHT : KEY_UNDEFINDED);
-      setup.input[i].key.up    = (i == 0 ? DEFAULT_KEY_UP    : KEY_UNDEFINDED);
-      setup.input[i].key.down  = (i == 0 ? DEFAULT_KEY_DOWN  : KEY_UNDEFINDED);
-      setup.input[i].key.snap  = (i == 0 ? DEFAULT_KEY_SNAP  : KEY_UNDEFINDED);
-      setup.input[i].key.bomb  = (i == 0 ? DEFAULT_KEY_BOMB  : KEY_UNDEFINDED);
-    }
-
+    Error(ERR_WARN, "cannot write setup file '%s'", filename);
     return;
   }
 
+  fprintf(file, "%s\n", getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER,
+					       getCookie("SETUP")));
+  fprintf(file, "\n");
 
-
-  /*
-  next_entry = &setup_file;
-  */
-
-
-
-  while(!feof(file))
+  /* global setup */
+  si = setup;
+  for (i=0; i<NUM_GLOBAL_SETUP_TOKENS; i++)
   {
-    /* read next line */
-    if (!fgets(line, MAX_LINE_LEN, file))
-      break;
-
-    /* cut trailing comment or whitespace from input line */
-    for (line_ptr = line; *line_ptr; line_ptr++)
-    {
-      if (*line_ptr == '#' || *line_ptr == '\n')
-      {
-	*line_ptr = '\0';
-	break;
-      }
-    }
-
-    /* cut trailing whitespaces from input line */
-    for (line_ptr = &line[strlen(line)]; line_ptr > line; line_ptr--)
-      if ((*line_ptr == ' ' || *line_ptr == '\t') && line_ptr[1] == '\0')
-	*line_ptr = '\0';
-
-    /* ignore empty lines */
-    if (*line == '\0')
-      continue;
+    /* just to make things nicer :) */
+    if (i == SETUP_TOKEN_PLAYER_NAME + 1 ||
+	i == SETUP_TOKEN_GRAPHICS_SET)
+      fprintf(file, "\n");
 
-    line_len = strlen(line);
+    fprintf(file, "%s\n", getSetupLine(global_setup_tokens, "", i));
+  }
 
+  /* editor setup */
+  sei = setup.editor;
+  fprintf(file, "\n");
+  for (i=0; i<NUM_EDITOR_SETUP_TOKENS; i++)
+    fprintf(file, "%s\n", getSetupLine(editor_setup_tokens, "", i));
 
-    /*
-    printf("line: '%s'\n", line);
-    */
+  /* shortcut setup */
+  ssi = setup.shortcut;
+  fprintf(file, "\n");
+  for (i=0; i<NUM_SHORTCUT_SETUP_TOKENS; i++)
+    fprintf(file, "%s\n", getSetupLine(shortcut_setup_tokens, "", i));
 
+  /* player setup */
+  for (pnr=0; pnr<MAX_PLAYERS; pnr++)
+  {
+    char prefix[30];
 
-    /* cut leading whitespaces from token */
-    for (token = line; *token; token++)
-      if (*token != ' ' && *token != '\t')
-	break;
+    sprintf(prefix, "%s%d", TOKEN_STR_PLAYER_PREFIX, pnr + 1);
+    fprintf(file, "\n");
 
-    /* find end of token */
-    for (line_ptr = token; *line_ptr; line_ptr++)
-    {
-      if (*line_ptr == ' ' || *line_ptr == '\t' || *line_ptr == ':')
-      {
-	*line_ptr = '\0';
-	break;
-      }
-    }
+    sii = setup.input[pnr];
+    for (i=0; i<NUM_PLAYER_SETUP_TOKENS; i++)
+      fprintf(file, "%s\n", getSetupLine(player_setup_tokens, prefix, i));
+  }
 
-    if (line_ptr < line + line_len)
-      value = line_ptr + 1;
-    else
-      value = "\0";
+  /* system setup */
+  syi = setup.system;
+  fprintf(file, "\n");
+  for (i=0; i<NUM_SYSTEM_SETUP_TOKENS; i++)
+    fprintf(file, "%s\n", getSetupLine(system_setup_tokens, "", i));
 
-    /* cut leading whitespaces from value */
-    for (; *value; value++)
-      if (*value != ' ' && *value != '\t')
-	break;
+  /* options setup */
+  soi = setup.options;
+  fprintf(file, "\n");
+  for (i=0; i<NUM_OPTIONS_SETUP_TOKENS; i++)
+    fprintf(file, "%s\n", getSetupLine(options_setup_tokens, "", i));
 
+  fclose(file);
 
-    /*
-    printf("token / value: '%s' / '%s'\n", token, value);
-    */
+  SetFilePermissions(filename, PERMS_PRIVATE);
+}
 
+void LoadCustomElementDescriptions()
+{
+  char *filename = getCustomArtworkConfigFilename(ARTWORK_TYPE_GRAPHICS);
+  SetupFileHash *setup_file_hash;
+  int i;
 
-    if (*token && *value)
+  for (i=0; i<NUM_FILE_ELEMENTS; i++)
+  {
+    if (element_info[i].custom_description != NULL)
     {
-      /* allocate new token/value pair */
-
-      *next_entry = newSetupFileInfo(token, value);
-      next_entry = &((*next_entry)->next);
+      free(element_info[i].custom_description);
+      element_info[i].custom_description = NULL;
     }
   }
 
-  fclose(file);
-
-#if 0
-  printf("Content of setup file info:\n");
-
-  printSetupFileInfo(setup_file_info);
-#endif
-
-
+  if ((setup_file_hash = loadSetupFileHash(filename)) == NULL)
+    return;
 
-  printf("decodeSetupFileInfo\n");
+  for (i=0; i<NUM_FILE_ELEMENTS; i++)
+  {
+    char *token = getStringCat2(element_info[i].token_name, ".name");
+    char *value = getHashEntry(setup_file_hash, token);
 
+    if (value != NULL)
+      element_info[i].custom_description = getStringCopy(value);
 
+    free(token);
+  }
 
-  decodeSetupFileInfo(setup_file_info);
-  freeSetupFileInfo(setup_file_info);
+  freeSetupFileHash(setup_file_hash);
 }
 
-void SaveSetup()
+void LoadSpecialMenuDesignSettings()
 {
-  int i;
-  char filename[MAX_FILENAME_LEN];
-  FILE *file;
-
-
-
-  printf("SaveSetup\n");
-
+  char *filename = getCustomArtworkConfigFilename(ARTWORK_TYPE_GRAPHICS);
+  SetupFileHash *setup_file_hash;
+  int i, j;
 
+  /* always start with reliable default values from default config */
+  for (i=0; image_config_vars[i].token != NULL; i++)
+    for (j=0; image_config[j].token != NULL; j++)
+      if (strcmp(image_config_vars[i].token, image_config[j].token) == 0)
+	*image_config_vars[i].value =
+	  get_integer_from_string(image_config[j].value);
 
-  sprintf(filename, "%s/%s", SETUP_PATH, SETUP_FILENAME);
+  if ((setup_file_hash = loadSetupFileHash(filename)) == NULL)
+    return;
 
-  if (!(file = fopen(filename, "w")))
+  /* special case: initialize with default values that may be overwritten */
+  for (i=0; i < NUM_SPECIAL_GFX_ARGS; i++)
   {
-    Error(ERR_RETURN, "cannot write setup file '%s'", filename);
-    return;
+    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);
   }
 
-  fprintf(file, "file_identifier:              %s\n",
-	  SETUP_COOKIE);
-
-  fprintf(file, "\n");
-
-  fprintf(file, "%s\n",
-	  getSetupEntry("", SETUP_TOKEN_SOUND,
-			setup.sound_on));
-  fprintf(file, "%s\n",
-	  getSetupEntry("", SETUP_TOKEN_SOUND_LOOPS,
-			setup.sound_loops_on));
-  fprintf(file, "%s\n",
-	  getSetupEntry("", SETUP_TOKEN_SOUND_MUSIC,
-			setup.sound_music_on));
-  fprintf(file, "%s\n",
-	  getSetupEntry("", SETUP_TOKEN_SOUND_SIMPLE,
-			setup.sound_simple_on));
-  fprintf(file, "%s\n",
-	  getSetupEntry("", SETUP_TOKEN_TOONS,
-			setup.toons_on));
-  fprintf(file, "%s\n",
-	  getSetupEntry("", SETUP_TOKEN_DIRECT_DRAW,
-			setup.direct_draw_on));
-  fprintf(file, "%s\n",
-	  getSetupEntry("", SETUP_TOKEN_SCROLL_DELAY,
-			setup.scroll_delay_on));
-  fprintf(file, "%s\n",
-	  getSetupEntry("", SETUP_TOKEN_SOFT_SCROLLING,
-			setup.soft_scrolling_on));
-  fprintf(file, "%s\n",
-	  getSetupEntry("", SETUP_TOKEN_FADING,
-			setup.fading_on));
-  fprintf(file, "%s\n",
-	  getSetupEntry("", SETUP_TOKEN_AUTORECORD,
-			setup.autorecord_on));
-  fprintf(file, "%s\n",
-	  getSetupEntry("", SETUP_TOKEN_QUICK_DOORS,
-			setup.quick_doors));
-
-  for (i=0; i<MAX_PLAYERS; i++)
+  /* read (and overwrite with) values that may be specified in config file */
+  for (i=0; image_config_vars[i].token != NULL; i++)
   {
-    char prefix[30];
-
-    sprintf(prefix, "%s%d", SETUP_TOKEN_PLAYER_PREFIX, i + 1);
-
-    fprintf(file, "\n");
+    char *value = getHashEntry(setup_file_hash, image_config_vars[i].token);
 
-    fprintf(file, "%s\n",
-	    getSetupEntry(prefix, SETUP_TOKEN_USE_JOYSTICK,
-			  setup.input[i].use_joystick));
-    fprintf(file, "%s\n",
-	    getSetupEntry(prefix, SETUP_TOKEN_JOYSTICK_NR,
-			  setup.input[i].joystick_nr));
-
-    fprintf(file, "%s%s:      %s\n", prefix,
-	    getSetupToken(SETUP_TOKEN_JOY_SNAP),
-	    getJoyNameFromJoySymbol(setup.input[i].joy.snap));
-    fprintf(file, "%s%s:      %s\n", prefix,
-	    getSetupToken(SETUP_TOKEN_JOY_BOMB),
-	    getJoyNameFromJoySymbol(setup.input[i].joy.bomb));
-
-    fprintf(file, "%s\n",
-	    getSetupEntryWithComment(prefix, SETUP_TOKEN_KEY_LEFT,
-				     setup.input[i].key.left));
-    fprintf(file, "%s\n",
-	    getSetupEntryWithComment(prefix, SETUP_TOKEN_KEY_RIGHT,
-				     setup.input[i].key.right));
-    fprintf(file, "%s\n",
-	    getSetupEntryWithComment(prefix, SETUP_TOKEN_KEY_UP,
-				     setup.input[i].key.up));
-    fprintf(file, "%s\n",
-	    getSetupEntryWithComment(prefix, SETUP_TOKEN_KEY_DOWN,
-				     setup.input[i].key.down));
-    fprintf(file, "%s\n",
-	    getSetupEntryWithComment(prefix, SETUP_TOKEN_KEY_SNAP,
-				     setup.input[i].key.snap));
-    fprintf(file, "%s\n",
-	    getSetupEntryWithComment(prefix, SETUP_TOKEN_KEY_BOMB,
-				     setup.input[i].key.bomb));
+    if (value != NULL)
+      *image_config_vars[i].value = get_integer_from_string(value);
   }
 
-  chmod(filename, SETUP_PERMS);
+  freeSetupFileHash(setup_file_hash);
 }