X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ffiles.c;h=e1a4b80c42c4720fa256b2bffacbf186c29d4a9e;hp=e349c062a9366d9971933f415ade98c6a96dd33d;hb=e5c5bf5c4a76a04f9bf64e92227bf2ef969fd25c;hpb=c3d03cdffce070695ba0520d00667b42b8460087

diff --git a/src/files.c b/src/files.c
index e349c062..e1a4b80c 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1,13 +1,12 @@
 /***********************************************************
 *  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
 *----------------------------------------------------------*
-*  ©1995 Artsoft Development                               *
-*        Holger Schemel                                    *
-*        33659 Bielefeld-Senne                             *
-*        Telefon: (0521) 493245                            *
-*        eMail: aeglos@valinor.owl.de                      *
-*               aeglos@uni-paderborn.de                    *
-*               q99492@pbhrzx.uni-paderborn.de             *
+*  (c) 1995-98 Artsoft Entertainment                       *
+*              Holger Schemel                              *
+*              Oststrasse 11a                              *
+*              33604 Bielefeld                             *
+*              phone: ++49 +521 290471                     *
+*              email: aeglos@valinor.owl.de                *
 *----------------------------------------------------------*
 *  files.h                                                 *
 ***********************************************************/
@@ -15,16 +14,18 @@
 #include "files.h"
 #include "tools.h"
 #include "misc.h"
+#include "tape.h"
+#include "joystick.h"
 
-BOOL CreateNewScoreFile()
+boolean CreateNewScoreFile()
 {
   int i,j,k;
-  char filename[MAX_FILENAME];
+  char filename[MAX_FILENAME_LEN];
   char empty_alias[MAX_NAMELEN];
   FILE *file;
 
   sprintf(filename,"%s/%s/%s",
-	  SCORE_PATH,leveldir[leveldir_nr].filename,SCORE_FILENAME);
+	  level_directory,leveldir[leveldir_nr].filename,SCORE_FILENAME);
 
   if (!(file=fopen(filename,"w")))
     return(FALSE);
@@ -34,7 +35,7 @@ BOOL CreateNewScoreFile()
   strncpy(empty_alias,EMPTY_ALIAS,MAX_NAMELEN-1);
 
   fputs(SCORE_COOKIE,file);		/* Formatkennung */
-  for(i=0;i<LEVELDIR_SIZE(leveldir[leveldir_nr]);i++)
+  for(i=0;i<leveldir[leveldir_nr].levels;i++)
   {
     for(j=0;j<MAX_SCORE_ENTRIES;j++)
     {
@@ -50,14 +51,14 @@ BOOL CreateNewScoreFile()
   return(TRUE);
 }
 
-BOOL CreateNewNamesFile(int mode)
+boolean CreateNewNamesFile(int mode)
 {
-  char filename[MAX_FILENAME];
+  char filename[MAX_FILENAME_LEN];
   FILE *file;
 
   if (mode==PLAYER_LEVEL)
     sprintf(filename,"%s/%s/%s",
-	    NAMES_PATH,leveldir[leveldir_nr].filename,NAMES_FILENAME);
+	    level_directory,leveldir[leveldir_nr].filename,NAMES_FILENAME);
   else
     sprintf(filename,"%s/%s",CONFIG_PATH,NAMES_FILENAME);
 
@@ -71,25 +72,25 @@ BOOL CreateNewNamesFile(int mode)
   return(TRUE);
 }
 
-BOOL LoadLevelInfo()
+boolean LoadLevelInfo()
 {
   int i;
-  char filename[MAX_FILENAME];
-  char cookie[MAX_FILENAME];
+  char filename[MAX_FILENAME_LEN];
+  char cookie[MAX_FILENAME_LEN];
   FILE *file;
 
-  sprintf(filename,"%s/%s",LEVEL_PATH,LEVDIR_FILENAME);
+  sprintf(filename,"%s/%s",level_directory,LEVDIR_FILENAME);
 
   if (!(file=fopen(filename,"r")))
   {
-    fprintf(stderr,"%s: cannot load level info '%s'!\n",progname,filename);
+    Error(ERR_RETURN, "cannot load level info '%s'", filename);
     return(FALSE);
   }
 
   fscanf(file,"%s\n",cookie);
   if (strcmp(cookie,LEVELDIR_COOKIE))	/* ungültiges Format? */
   {
-    fprintf(stderr,"%s: wrong format of level info file!\n",progname);
+    Error(ERR_RETURN, "wrong format of level info file");
     fclose(file);
     return(FALSE);
   }
@@ -100,8 +101,8 @@ BOOL LoadLevelInfo()
   {
     fscanf(file,"%s",leveldir[i].filename);
     fscanf(file,"%s",leveldir[i].name);
-    fscanf(file,"%d",&leveldir[i].num_ready);
-    fscanf(file,"%d",&leveldir[i].num_free);
+    fscanf(file,"%d",&leveldir[i].levels);
+    fscanf(file,"%d",&leveldir[i].readonly);
     if (feof(file))
       break;
 
@@ -110,7 +111,7 @@ BOOL LoadLevelInfo()
 
   if (!num_leveldirs)
   {
-    fprintf(stderr,"%s: empty level info '%s'!\n",progname,filename);
+    Error(ERR_RETURN, "empty level info '%s'", filename);
     return(FALSE);
   }
 
@@ -120,27 +121,23 @@ BOOL LoadLevelInfo()
 void LoadLevel(int level_nr)
 {
   int i,x,y;
-  char filename[MAX_FILENAME];
-  char cookie[MAX_FILENAME];
+  char filename[MAX_FILENAME_LEN];
+  char cookie[MAX_FILENAME_LEN];
   FILE *file;
 
   sprintf(filename,"%s/%s/%d",
-	  LEVEL_PATH,leveldir[leveldir_nr].filename,level_nr);
+	  level_directory,leveldir[leveldir_nr].filename,level_nr);
 
-  if (!(file=fopen(filename,"r")))
-  {
-/*
-    fprintf(stderr,"%s: cannot load level '%s'!\n",progname,filename);
-*/
-  }
+  if (!(file = fopen(filename,"r")))
+    Error(ERR_RETURN, "cannot load level '%s' - creating new level", filename);
   else
   {
     fgets(cookie,LEVEL_COOKIE_LEN,file);
     fgetc(file);
+
     if (strcmp(cookie,LEVEL_COOKIE))	/* ungültiges Format? */
     {
-      fprintf(stderr,"%s: wrong format of level file '%s'!\n",
-	      progname,filename);
+      Error(ERR_RETURN, "wrong format of level file '%s'", filename);
       fclose(file);
       file = NULL;
     }
@@ -155,9 +152,9 @@ void LoadLevel(int level_nr)
     level.edelsteine	= (fgetc(file)<<8) | fgetc(file);
     for(i=0;i<MAX_LEVNAMLEN;i++)
       level.name[i]	= fgetc(file);
-    for(i=0;i<MAX_SC_ENTRIES;i++)
+    level.name[MAX_LEVNAMLEN-1] = 0;
+    for(i=0;i<MAX_LEVSCORE_ENTRIES;i++)
       level.score[i]	= fgetc(file);
-    level.amoebe_inhalt = fgetc(file);
     for(i=0;i<4;i++)
       for(y=0;y<3;y++)
 	for(x=0;x<3;x++)
@@ -165,8 +162,9 @@ void LoadLevel(int level_nr)
     level.tempo_amoebe	= fgetc(file);
     level.dauer_sieb	= fgetc(file);
     level.dauer_ablenk	= fgetc(file);
+    level.amoebe_inhalt = fgetc(file);
 
-    for(i=0;i<19;i++)	/* Rest reserviert / Headergröße 80 Bytes */
+    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++) 
@@ -190,9 +188,8 @@ void LoadLevel(int level_nr)
     level.time		= 100;
     level.edelsteine	= 0;
     strncpy(level.name,"Nameless Level",MAX_LEVNAMLEN-1);
-    for(i=0;i<MAX_SC_ENTRIES;i++)
+    for(i=0;i<MAX_LEVSCORE_ENTRIES;i++)
       level.score[i]	= 10;
-    level.amoebe_inhalt = EL_DIAMANT;
     for(i=0;i<4;i++)
       for(y=0;y<3;y++)
 	for(x=0;x<3;x++)
@@ -200,6 +197,7 @@ void LoadLevel(int level_nr)
     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++) 
@@ -213,21 +211,28 @@ void LoadLevel(int level_nr)
 void LoadLevelTape(int level_nr)
 {
   int i;
-  char filename[MAX_FILENAME];
-  char cookie[MAX_FILENAME];
+  char filename[MAX_FILENAME_LEN];
+  char cookie[MAX_FILENAME_LEN];
   FILE *file;
+  boolean levelrec_10 = FALSE;
 
+#ifndef MSDOS
   sprintf(filename,"%s/%s/%d.tape",
-	  LEVEL_PATH,leveldir[leveldir_nr].filename,level_nr);
+	  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")))
   {
     fgets(cookie,LEVELREC_COOKIE_LEN,file);
     fgetc(file);
-    if (strcmp(cookie,LEVELREC_COOKIE))	/* ungültiges Format? */
+    if (!strcmp(cookie,LEVELREC_COOKIE_10))	/* old 1.0 tape format */
+      levelrec_10 = TRUE;
+    else if (strcmp(cookie,LEVELREC_COOKIE))	/* unknown tape format */
     {
-      fprintf(stderr,"%s: wrong format of level recording file '%s'!\n",
-	      progname,filename);
+      Error(ERR_RETURN, "wrong format of level recording file '%s'", filename);
       fclose(file);
       file = NULL;
     }
@@ -245,51 +250,59 @@ void LoadLevelTape(int level_nr)
 
   tape.level_nr = level_nr;
   tape.counter = 0;
+  tape.changed = FALSE;
+
   tape.recording = FALSE;
   tape.playing = FALSE;
   tape.pausing = FALSE;
 
   for(i=0;i<tape.length;i++)
   {
-    if (i>=MAX_TAPELEN)
+    int j;
+
+    if (i >= MAX_TAPELEN)
       break;
-    tape.pos[i].joystickdata = fgetc(file);
-    tape.pos[i].delay        = fgetc(file);
+
+    for(j=0; j<MAX_PLAYERS; j++)
+    {
+      if (levelrec_10 && j>0)
+      {
+	tape.pos[i].action[j] = MV_NO_MOVING;
+	continue;
+      }
+      tape.pos[i].action[j] = fgetc(file);
+    }
+
+    tape.pos[i].delay = fgetc(file);
+
     if (feof(file))
       break;
   }
 
-  if (i != tape.length)
-    fprintf(stderr,"%s: level recording file '%s' corrupted!\n",
-	    progname,filename);
-
   fclose(file);
 
-  master_tape = tape;
+  if (i != tape.length)
+    Error(ERR_RETURN, "level recording file '%s' corrupted", filename);
+
+  tape.length_seconds = GetTapeLength();
 }
 
 void LoadScore(int level_nr)
 {
   int i,j;
-  char filename[MAX_FILENAME];
-  char cookie[MAX_FILENAME];
+  char filename[MAX_FILENAME_LEN];
+  char cookie[MAX_FILENAME_LEN];
   FILE *file;
 
   sprintf(filename,"%s/%s/%s",
-	  SCORE_PATH,leveldir[leveldir_nr].filename,SCORE_FILENAME);
+	  level_directory,leveldir[leveldir_nr].filename,SCORE_FILENAME);
 
-  if (!(file=fopen(filename,"r")))
+  if (!(file = fopen(filename,"r")))
   {
     if (!CreateNewScoreFile())
-    {
-      fprintf(stderr,"%s: cannot create score file '%s'!\n",
-	      progname,filename);
-    }
-    else if (!(file=fopen(filename,"r"))) 
-    {
-      fprintf(stderr,"%s: cannot load score for level %d!\n",
-	      progname,level_nr);
-    }
+      Error(ERR_RETURN, "cannot create score file '%s'", filename);
+    else if (!(file = fopen(filename,"r"))) 
+      Error(ERR_RETURN, "cannot load score for level %d", level_nr);
   }
 
   if (file)
@@ -297,7 +310,7 @@ void LoadScore(int level_nr)
     fgets(cookie,SCORE_COOKIE_LEN,file);
     if (strcmp(cookie,SCORE_COOKIE))	/* ungültiges Format? */
     {
-      fprintf(stderr,"%s: wrong format of score file!\n",progname);
+      Error(ERR_RETURN, "wrong format of score file '%s'", filename);
       fclose(file);
       file = NULL;
     }
@@ -329,15 +342,16 @@ void LoadScore(int level_nr)
 void LoadPlayerInfo(int mode)
 {
   int i;
-  char filename[MAX_FILENAME];
-  char cookie[MAX_FILENAME];
+  char filename[MAX_FILENAME_LEN];
+  char cookie[MAX_FILENAME_LEN];
   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",
-	    NAMES_PATH,leveldir[leveldir_nr].filename,NAMES_FILENAME);
+	    level_directory,leveldir[leveldir_nr].filename,NAMES_FILENAME);
   else
     sprintf(filename,"%s/%s",CONFIG_PATH,NAMES_FILENAME);
 
@@ -348,30 +362,26 @@ void LoadPlayerInfo(int mode)
   default_player.handicap = 0;
   default_player.setup = DEFAULT_SETUP;
   default_player.leveldir_nr = 0;
+  default_player.level_nr = 0;
 
   new_player = default_player;
 
-  if (!(file=fopen(filename,"r")))
+  if (!(file = fopen(filename,"r")))
   {
     if (!CreateNewNamesFile(mode))
-    {
-      fprintf(stderr,"%s: cannot create names file '%s'!\n",
-	      progname,filename);
-    }
-    else if (!(file=fopen(filename,"r"))) 
-    {
-      fprintf(stderr,"%s: cannot load player information '%s'!\n",
-	      progname,filename);
-    }
+      Error(ERR_RETURN, "cannot create names file '%s'", filename);
+    else if (!(file = fopen(filename,"r"))) 
+      Error(ERR_RETURN, "cannot load player information file '%s'", filename);
   }
 
   if (file)
   {
     fgets(cookie,NAMES_COOKIE_LEN,file);
-    if (strcmp(cookie,NAMES_COOKIE))	/* ungültiges Format? */
+    if (!strcmp(cookie,NAMES_COOKIE_10))	/* altes Format? */
+      version_10_file = TRUE;
+    else if (strcmp(cookie,NAMES_COOKIE))	/* ungültiges Format? */
     {
-      fprintf(stderr,"%s: wrong format of names file '%s'!\n",
-	      progname,filename);
+      Error(ERR_RETURN, "wrong format of names file '%s'", filename);
       fclose(file);
       file = NULL;
     }
@@ -379,8 +389,8 @@ void LoadPlayerInfo(int mode)
 
   if (!file)
   {
-    player = default_player;
-    level_nr = default_player.handicap;
+    *local_player = default_player;
+    level_nr = default_player.level_nr;
     return;
   }
 
@@ -393,17 +403,23 @@ void LoadPlayerInfo(int mode)
     new_player.handicap = fgetc(file);
     new_player.setup = (fgetc(file)<<8) | fgetc(file);
     new_player.leveldir_nr = fgetc(file);
+    if (!version_10_file)
+    {
+      new_player.level_nr = fgetc(file);
+      for(i=0;i<10;i++)		/* currently unused bytes */
+	fgetc(file);
+    }
+    else
+      new_player.level_nr = new_player.handicap;
 
     if (feof(file))		/* Spieler noch nicht in Liste enthalten */
     {
       new_player = default_player;
 
       fclose(file);
-      if (!(file=fopen(filename,"a")))
-      {
-	fprintf(stderr,"%s: cannot append new player to names file '%s'!\n",
-		progname,filename);
-      }
+      if (!(file = fopen(filename,"a")))
+	Error(ERR_RETURN, "cannot append new player to names file '%s'",
+	      filename);
       else
       {
 	for(i=0;i<MAX_NAMELEN;i++)
@@ -414,6 +430,12 @@ void LoadPlayerInfo(int mode)
 	fputc(new_player.setup / 256,file);
 	fputc(new_player.setup % 256,file);
 	fputc(new_player.leveldir_nr,file);
+	if (!version_10_file)
+	{
+	  fputc(new_player.level_nr,file);
+	  for(i=0;i<10;i++)	/* currently unused bytes */
+	    fputc(0,file);
+	}
       }
       break;
     }
@@ -424,31 +446,36 @@ void LoadPlayerInfo(int mode)
 
   if (mode==PLAYER_SETUP)
   {
-    player = new_player;
-    if (player.leveldir_nr < num_leveldirs)
-      leveldir_nr = player.leveldir_nr;
+    *local_player = new_player;
+    if (local_player->leveldir_nr < num_leveldirs)
+      leveldir_nr = local_player->leveldir_nr;
     else
       leveldir_nr = 0;
   }
   else
-    player.handicap = new_player.handicap;
+  {
+    local_player->handicap = new_player.handicap;
+    local_player->level_nr = new_player.level_nr;
+  }
 
-  level_nr = player.handicap;
-  fclose(file);
+  level_nr = local_player->level_nr;
+
+  if (file)
+    fclose(file);
 }
 
 void SaveLevel(int level_nr)
 {
   int i,x,y;
-  char filename[MAX_FILENAME];
+  char filename[MAX_FILENAME_LEN];
   FILE *file;
 
   sprintf(filename,"%s/%s/%d",
-	  LEVEL_PATH,leveldir[leveldir_nr].filename,level_nr);
+	  level_directory,leveldir[leveldir_nr].filename,level_nr);
 
   if (!(file=fopen(filename,"w")))
   {
-    fprintf(stderr,"%s: cannot save level file '%s'!\n",progname,filename);
+    Error(ERR_RETURN, "cannot save level file '%s'", filename);
     return;
   }
 
@@ -464,9 +491,8 @@ void SaveLevel(int level_nr)
 
   for(i=0;i<MAX_LEVNAMLEN;i++)
     fputc(level.name[i],file);
-  for(i=0;i<MAX_SC_ENTRIES;i++)
+  for(i=0;i<MAX_LEVSCORE_ENTRIES;i++)
     fputc(level.score[i],file);
-  fputc(level.amoebe_inhalt,file);
   for(i=0;i<4;i++)
     for(y=0;y<3;y++)
       for(x=0;x<3;x++)
@@ -474,8 +500,9 @@ void SaveLevel(int level_nr)
   fputc(level.tempo_amoebe,file);
   fputc(level.dauer_sieb,file);
   fputc(level.dauer_ablenk,file);
+  fputc(level.amoebe_inhalt,file);
 
-  for(i=0;i<19;i++)	/* Rest reserviert / Headergröße 80 Bytes */
+  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++) 
@@ -490,12 +517,17 @@ void SaveLevel(int level_nr)
 void SaveLevelTape(int level_nr)
 {
   int i;
-  char filename[MAX_FILENAME];
+  char filename[MAX_FILENAME_LEN];
   FILE *file;
-  BOOL new_tape = TRUE;
+  boolean new_tape = TRUE;
 
+#ifndef MSDOS
   sprintf(filename,"%s/%s/%d.tape",
-	  LEVEL_PATH,leveldir[leveldir_nr].filename,level_nr);
+	  level_directory,leveldir[leveldir_nr].filename,level_nr);
+#else
+  sprintf(filename,"%s/%s/%d.tap",
+	  level_directory,leveldir[leveldir_nr].filename,level_nr);
+#endif
 
   /* Testen, ob bereits eine Aufnahme existiert */
   if ((file=fopen(filename,"r")))
@@ -503,22 +535,19 @@ void SaveLevelTape(int level_nr)
     new_tape = FALSE;
     fclose(file);
 
-    if (!AreYouSure("Replace old tape ?",AYS_ASK))
+    if (!Request("Replace old tape ?",REQ_ASK))
       return;
   }
 
   if (!(file=fopen(filename,"w")))
   {
-    fprintf(stderr,"%s: cannot save level recording file '%s'!\n",
-	    progname,filename);
+    Error(ERR_RETURN, "cannot save level recording file '%s'", filename);
     return;
   }
 
   fputs(LEVELREC_COOKIE,file);		/* Formatkennung */
   fputc(0x0a,file);
 
-  tape = master_tape;
-
   fputc((tape.random_seed >> 24) & 0xff,file);
   fputc((tape.random_seed >> 16) & 0xff,file);
   fputc((tape.random_seed >>  8) & 0xff,file);
@@ -536,7 +565,11 @@ void SaveLevelTape(int level_nr)
 
   for(i=0;i<tape.length;i++)
   {
-    fputc(tape.pos[i].joystickdata,file);
+    int j;
+
+    for(j=0; j<MAX_PLAYERS; j++)
+      fputc(tape.pos[i].action[j],file);
+
     fputc(tape.pos[i].delay,file);
   }
 
@@ -544,23 +577,24 @@ void SaveLevelTape(int level_nr)
 
   chmod(filename, LEVREC_PERMS);
 
+  tape.changed = FALSE;
+
   if (new_tape)
-    AreYouSure("tape saved !",AYS_CONFIRM);
+    Request("tape saved !",REQ_CONFIRM);
 }
 
 void SaveScore(int level_nr)
 {
   int i,j;
-  char filename[MAX_FILENAME];
+  char filename[MAX_FILENAME_LEN];
   FILE *file;
 
   sprintf(filename,"%s/%s/%s",
-	  SCORE_PATH,leveldir[leveldir_nr].filename,SCORE_FILENAME);
+	  level_directory,leveldir[leveldir_nr].filename,SCORE_FILENAME);
 
   if (!(file=fopen(filename,"r+")))
   {
-    fprintf(stderr,"%s: cannot save score for level %d!\n",
-	    progname,level_nr);
+    Error(ERR_RETURN, "cannot save score for level %d", level_nr);
     return;
   }
 
@@ -580,29 +614,30 @@ void SaveScore(int level_nr)
 void SavePlayerInfo(int mode)
 {
   int i;
-  char filename[MAX_FILENAME];
-  char cookie[MAX_FILENAME];
+  char filename[MAX_FILENAME_LEN];
+  char cookie[MAX_FILENAME_LEN];
   FILE *file;
   struct PlayerInfo default_player;
+  int version_10_file = FALSE;
 
   if (mode==PLAYER_LEVEL)
     sprintf(filename,"%s/%s/%s",
-	    NAMES_PATH,leveldir[leveldir_nr].filename,NAMES_FILENAME);
+	    level_directory,leveldir[leveldir_nr].filename,NAMES_FILENAME);
   else
     sprintf(filename,"%s/%s",CONFIG_PATH,NAMES_FILENAME);
 
-  if (!(file=fopen(filename,"r+")))
+  if (!(file = fopen(filename,"r+")))
   {
-    fprintf(stderr,"%s: cannot save player information '%s'!\n",
-	    progname,filename);
+    Error(ERR_RETURN, "cannot save player information to file '%s'", filename);
     return;
   }
 
   fgets(cookie,NAMES_COOKIE_LEN,file);
-  if (strcmp(cookie,NAMES_COOKIE))	/* ungültiges Format? */
+  if (!strcmp(cookie,NAMES_COOKIE_10))	/* altes Format? */
+    version_10_file = TRUE;
+  else if (strcmp(cookie,NAMES_COOKIE))	/* ungültiges Format? */
   {
-    fprintf(stderr,"%s: wrong format of names file '%s'!\n",
-	    progname,filename);
+    Error(ERR_RETURN, "wrong format of names file '%s'", filename);
     fclose(file);
     return;
   }
@@ -616,25 +651,42 @@ void SavePlayerInfo(int mode)
     default_player.handicap = fgetc(file);
     default_player.setup = (fgetc(file)<<8) | fgetc(file);
     default_player.leveldir_nr = fgetc(file);
+    if (!version_10_file)
+    {
+      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,player.login_name,MAX_NAMELEN-1))
+      if (!strncmp(default_player.login_name,
+		   local_player->login_name, MAX_NAMELEN-1))
       {
-	fseek(file,-(2*MAX_NAMELEN+1+2+1),SEEK_CUR);
+	fseek(file,-(2*MAX_NAMELEN+1+2+1+(version_10_file ? 0 : 11)),SEEK_CUR);
 	break;
       }
   }
 
+  local_player->level_nr = level_nr;
+
   for(i=0;i<MAX_NAMELEN;i++)
-    fputc(player.login_name[i],file);
+    fputc(local_player->login_name[i],file);
   for(i=0;i<MAX_NAMELEN;i++)
-    fputc(player.alias_name[i],file);
-  fputc(player.handicap,file);
-  fputc(player.setup / 256,file);
-  fputc(player.setup % 256,file);
-  fputc(player.leveldir_nr,file);
+    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);
+  }
 
   fclose(file);
 }
@@ -648,13 +700,14 @@ void LoadJoystickData()
   if (joystick_status==JOYSTICK_OFF)
     return;
 
+#ifndef MSDOS
   if (!(file=fopen(JOYDAT_FILE,"r")))
     return;
 
   fscanf(file,"%s",cookie);
   if (strcmp(cookie,JOYSTICK_COOKIE))	/* ungültiges Format? */
   {
-    fprintf(stderr,"%s: wrong format of joystick file!\n",progname);
+    Error(ERR_RETURN, "wrong format of joystick file '%s'", JOYDAT_FILE);
     fclose(file);
     return;
   }
@@ -670,6 +723,9 @@ void LoadJoystickData()
   fclose(file);
 
   CheckJoystickData();
+#else
+  load_joystick_data(JOYDAT_FILE);
+#endif
 }
 
 void SaveJoystickData()
@@ -680,11 +736,13 @@ void SaveJoystickData()
   if (joystick_status==JOYSTICK_OFF)
     return;
 
+#ifndef MSDOS
   CheckJoystickData();
 
   if (!(file=fopen(JOYDAT_FILE,"w")))
   {
-    fprintf(stderr,"%s: cannot save joystick calibration data!\n",progname);
+    Error(ERR_RETURN, "cannot save joystick calibration data to file '%s'",
+	  JOYDAT_FILE);
     return;
   }
 
@@ -700,4 +758,8 @@ void SaveJoystickData()
   fclose(file);
 
   chmod(JOYDAT_FILE, JOYDAT_PERMS);
+#else
+  save_joystick_data(JOYDAT_FILE);
+#endif
+
 }