X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=d34fe40da717af4a1ab00e4a1b927d58f4a255c7;hb=2fe0fbc2a34fd4b50081f1829931dea3ca2c4c1c;hp=9e35c06009c35736d877fc900bd77cdeec02c214;hpb=823bddb0d9cc63ddda17a2cd20266aa3b82bde38;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 9e35c060..d34fe40d 100644
--- a/src/files.c
+++ b/src/files.c
@@ -20,7 +20,7 @@
 BOOL CreateNewScoreFile()
 {
   int i,j,k;
-  char filename[MAX_FILENAME];
+  char filename[MAX_FILENAME_LEN];
   char empty_alias[MAX_NAMELEN];
   FILE *file;
 
@@ -53,7 +53,7 @@ BOOL CreateNewScoreFile()
 
 BOOL CreateNewNamesFile(int mode)
 {
-  char filename[MAX_FILENAME];
+  char filename[MAX_FILENAME_LEN];
   FILE *file;
 
   if (mode==PLAYER_LEVEL)
@@ -75,22 +75,22 @@ BOOL CreateNewNamesFile(int mode)
 BOOL 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_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);
   }
@@ -111,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);
   }
 
@@ -121,19 +121,15 @@ 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_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);
@@ -141,8 +137,7 @@ void LoadLevel(int level_nr)
 
     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;
     }
@@ -216,8 +211,8 @@ 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;
   BOOL levelrec_10 = FALSE;
 
@@ -237,8 +232,7 @@ void LoadLevelTape(int level_nr)
       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;
     }
@@ -273,10 +267,10 @@ void LoadLevelTape(int level_nr)
     {
       if (levelrec_10 && j>0)
       {
-	tape.pos[i].joystickdata[j] = MV_NO_MOVING;
+	tape.pos[i].action[j] = MV_NO_MOVING;
 	continue;
       }
-      tape.pos[i].joystickdata[j] = fgetc(file);
+      tape.pos[i].action[j] = fgetc(file);
     }
 
     tape.pos[i].delay = fgetc(file);
@@ -288,8 +282,7 @@ void LoadLevelTape(int level_nr)
   fclose(file);
 
   if (i != tape.length)
-    fprintf(stderr,"%s: level recording file '%s' corrupted!\n",
-	    progname,filename);
+    Error(ERR_RETURN, "level recording file '%s' corrupted", filename);
 
   tape.length_seconds = GetTapeLength();
 }
@@ -297,25 +290,19 @@ void LoadLevelTape(int level_nr)
 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",
 	  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)
@@ -323,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;
     }
@@ -355,8 +342,8 @@ 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;
@@ -379,18 +366,12 @@ void LoadPlayerInfo(int mode)
 
   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)
@@ -400,8 +381,7 @@ void LoadPlayerInfo(int mode)
       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;
     }
@@ -437,11 +417,9 @@ void LoadPlayerInfo(int mode)
       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++)
@@ -487,7 +465,7 @@ void LoadPlayerInfo(int mode)
 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",
@@ -495,7 +473,7 @@ void SaveLevel(int 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;
   }
 
@@ -537,7 +515,7 @@ 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;
 
@@ -555,14 +533,13 @@ 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;
   }
 
@@ -589,7 +566,7 @@ void SaveLevelTape(int level_nr)
     int j;
 
     for(j=0; j<MAX_PLAYERS; j++)
-      fputc(tape.pos[i].joystickdata[j],file);
+      fputc(tape.pos[i].action[j],file);
 
     fputc(tape.pos[i].delay,file);
   }
@@ -601,13 +578,13 @@ void SaveLevelTape(int level_nr)
   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",
@@ -615,8 +592,7 @@ void SaveScore(int level_nr)
 
   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;
   }
 
@@ -636,8 +612,8 @@ 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;
@@ -648,10 +624,9 @@ void SavePlayerInfo(int mode)
   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;
   }
 
@@ -660,8 +635,7 @@ void SavePlayerInfo(int mode)
     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;
   }
@@ -731,7 +705,7 @@ void LoadJoystickData()
   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;
   }
@@ -765,7 +739,8 @@ void SaveJoystickData()
 
   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;
   }