X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=d28c1f48279502d5dcfa181d4f271e802c212ef0;hb=c020bbb83dd5b52a353fa867d7746a43eb5e6ffc;hp=81838cf4efe55b47d602ee5fff45f0dff7a148c3;hpb=7600b7d74df219d2a0956e03cea3af49226903c2;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 81838cf4..d28c1f48 100644
--- a/src/files.c
+++ b/src/files.c
@@ -49,6 +49,7 @@
 #define SETUP_FILENAME		"setup.conf"
 #define LEVELSETUP_FILENAME	"levelsetup.conf"
 #define LEVELINFO_FILENAME	"levelinfo.conf"
+#define LEVELFILE_EXTENSION	"level"
 #define TAPEFILE_EXTENSION	"tape"
 #define SCOREFILE_EXTENSION	"score"
 #else
@@ -56,6 +57,7 @@
 #define SETUP_FILENAME		"setup.cnf"
 #define LEVELSETUP_FILENAME	"lvlsetup.cnf"
 #define LEVELINFO_FILENAME	"lvlinfo.cnf"
+#define LEVELFILE_EXTENSION	"lvl"
 #define TAPEFILE_EXTENSION	"rec"
 #define SCOREFILE_EXTENSION	"sco"
 #endif
@@ -150,6 +152,52 @@ static char *getScoreDir(char *level_subdir)
   return score_dir;
 }
 
+static char *getLevelFilename(int nr)
+{
+  static char *filename = NULL;
+  char basename[20 + strlen(LEVELFILE_EXTENSION)];
+
+  if (filename != NULL)
+    free(filename);
+
+  sprintf(basename, "%03d.%s", nr, LEVELFILE_EXTENSION);
+  filename = getPath3((leveldir[leveldir_nr].user_defined ?
+		       getUserLevelDir("") :
+		       options.level_directory),
+		      leveldir[leveldir_nr].filename,
+		      basename);
+
+  return filename;
+}
+
+static char *getTapeFilename(int nr)
+{
+  static char *filename = NULL;
+  char basename[20 + strlen(LEVELFILE_EXTENSION)];
+
+  if (filename != NULL)
+    free(filename);
+
+  sprintf(basename, "%03d.%s", nr, TAPEFILE_EXTENSION);
+  filename = getPath2(getTapeDir(leveldir[leveldir_nr].filename), basename);
+
+  return filename;
+}
+
+static char *getScoreFilename(int nr)
+{
+  static char *filename = NULL;
+  char basename[20 + strlen(LEVELFILE_EXTENSION)];
+
+  if (filename != NULL)
+    free(filename);
+
+  sprintf(basename, "%03d.%s", nr, SCOREFILE_EXTENSION);
+  filename = getPath2(getScoreDir(leveldir[leveldir_nr].filename), basename);
+
+  return filename;
+}
+
 static void createDirectory(char *dir, char *text)
 {
   if (access(dir, F_OK) != 0)
@@ -164,6 +212,7 @@ static void InitUserDataDirectory()
 
 static void InitTapeDirectory(char *level_subdir)
 {
+  createDirectory(getUserDataDir(), "user data");
   createDirectory(getTapeDir(""), "main tape");
   createDirectory(getTapeDir(level_subdir), "level tape");
 }
@@ -178,6 +227,7 @@ static void InitUserLevelDirectory(char *level_subdir)
 {
   if (access(getUserLevelDir(level_subdir), F_OK) != 0)
   {
+    createDirectory(getUserDataDir(), "user data");
     createDirectory(getUserLevelDir(""), "main user level");
     createDirectory(getUserLevelDir(level_subdir), "user level");
 
@@ -221,7 +271,7 @@ static void setLevelInfoToDefaults()
 void LoadLevel(int level_nr)
 {
   int i, x, y;
-  char filename[MAX_FILENAME_LEN];
+  char *filename = getLevelFilename(level_nr);
   char cookie[MAX_LINE_LEN];
   char chunk[CHUNK_ID_LEN + 1];
   int file_version = FILE_VERSION_1_2;	/* last version of level files */
@@ -231,13 +281,6 @@ void LoadLevel(int level_nr)
   /* always start with reliable default values */
   setLevelInfoToDefaults();
 
-  if (leveldir[leveldir_nr].user_defined)
-    sprintf(filename, "%s/%s/%d",
-	    getUserLevelDir(""), leveldir[leveldir_nr].filename, level_nr);
-  else
-    sprintf(filename, "%s/%s/%d",
-	    options.level_directory, leveldir[leveldir_nr].filename, level_nr);
-
   if (!(file = fopen(filename, "r")))
   {
     Error(ERR_WARN, "cannot read level '%s' - creating new level", filename);
@@ -327,17 +370,10 @@ void LoadLevel(int level_nr)
 void SaveLevel(int level_nr)
 {
   int i, x, y;
-  char filename[MAX_FILENAME_LEN];
+  char *filename = getLevelFilename(level_nr);
   FILE *file;
   int chunk_length;
 
-  if (leveldir[leveldir_nr].user_defined)
-    sprintf(filename, "%s/%s/%d",
-	    getUserLevelDir(""), leveldir[leveldir_nr].filename, level_nr);
-  else
-    sprintf(filename, "%s/%s/%d",
-	    options.level_directory, leveldir[leveldir_nr].filename, level_nr);
-
   if (!(file = fopen(filename, "w")))
   {
     Error(ERR_WARN, "cannot save level file '%s'", filename);
@@ -399,7 +435,7 @@ void SaveLevel(int level_nr)
 void LoadTape(int level_nr)
 {
   int i, j;
-  char filename[MAX_FILENAME_LEN];
+  char *filename = getTapeFilename(level_nr);
   char cookie[MAX_LINE_LEN];
   char chunk[CHUNK_ID_LEN + 1];
   FILE *file;
@@ -407,10 +443,6 @@ void LoadTape(int level_nr)
   int file_version = FILE_VERSION_1_2;	/* last version of tape files */
   int chunk_length;
 
-  sprintf(filename, "%s/%d.%s",
-	  getTapeDir(leveldir[leveldir_nr].filename),
-	  level_nr, TAPEFILE_EXTENSION);
-
   if (!(file = fopen(filename, "r")))
     return;
 
@@ -559,7 +591,7 @@ void LoadTape(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;
   byte store_participating_players;
@@ -568,16 +600,10 @@ void SaveTape(int level_nr)
 
   InitTapeDirectory(leveldir[leveldir_nr].filename);
 
-  sprintf(filename, "%s/%d.%s",
-	  getTapeDir(leveldir[leveldir_nr].filename),
-	  level_nr, TAPEFILE_EXTENSION);
-
   /* if a tape still exists, ask to overwrite it */
-  if ((file = fopen(filename, "r")))
+  if (access(filename, F_OK) == 0)
   {
     new_tape = FALSE;
-    fclose(file);
-
     if (!Request("Replace old tape ?", REQ_ASK))
       return;
   }
@@ -664,28 +690,26 @@ void SaveTape(int level_nr)
 void LoadScore(int level_nr)
 {
   int i;
-  char filename[MAX_FILENAME_LEN];
+  char *filename = getScoreFilename(level_nr);
   char cookie[MAX_LINE_LEN];
   char line[MAX_LINE_LEN];
   char *line_ptr;
   FILE *file;
 
-  /* start with empty score table */
+  /* always start with reliable default values */
   for(i=0; i<MAX_SCORE_ENTRIES; i++)
   {
     strcpy(highscore[i].Name, EMPTY_ALIAS);
     highscore[i].Score = 0;
   }
 
-  sprintf(filename, "%s/%d.%s",
-	  getScoreDir(leveldir[leveldir_nr].filename),
-	  level_nr, SCOREFILE_EXTENSION);
-
   if (!(file = fopen(filename, "r")))
     return;
 
   /* check file identifier */
   fgets(cookie, MAX_LINE_LEN, file);
+  if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n')
+    cookie[strlen(cookie) - 1] = '\0';
 
   if (strcmp(cookie, SCORE_COOKIE) != 0)
   {
@@ -719,15 +743,11 @@ void LoadScore(int level_nr)
 void SaveScore(int level_nr)
 {
   int i;
-  char filename[MAX_FILENAME_LEN];
+  char *filename = getScoreFilename(level_nr);
   FILE *file;
 
   InitScoreDirectory(leveldir[leveldir_nr].filename);
 
-  sprintf(filename, "%s/%d.%s",
-	  getScoreDir(leveldir[leveldir_nr].filename),
-	  level_nr, SCOREFILE_EXTENSION);
-
   if (!(file = fopen(filename, "w")))
   {
     Error(ERR_WARN, "cannot save score for level %d", level_nr);
@@ -1009,7 +1029,7 @@ static struct SetupFileList *loadSetupFileList(char *filename)
 
   if (!(file = fopen(filename, "r")))
   {
-    Error(ERR_WARN, "cannot open setup/info file '%s'", filename);
+    Error(ERR_WARN, "cannot open configuration file '%s'", filename);
     return NULL;
   }
 
@@ -1078,7 +1098,7 @@ static struct SetupFileList *loadSetupFileList(char *filename)
   freeSetupFileList(setup_file_list);
 
   if (first_valid_list_entry == NULL)
-    Error(ERR_WARN, "setup/info file '%s' is empty", filename);
+    Error(ERR_WARN, "configuration file '%s' is empty", filename);
 
   return first_valid_list_entry;
 }
@@ -1093,7 +1113,7 @@ static void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list,
   {
     if (strcmp(setup_file_list->value, identifier) != 0)
     {
-      Error(ERR_WARN, "setup/info file has wrong version");
+      Error(ERR_WARN, "configuration file has wrong version");
       return;
     }
     else
@@ -1104,7 +1124,7 @@ static void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list,
     checkSetupFileListIdentifier(setup_file_list->next, identifier);
   else
   {
-    Error(ERR_WARN, "setup/info file has no version information");
+    Error(ERR_WARN, "configuration file has no version information");
     return;
   }
 }
@@ -1297,7 +1317,10 @@ static int LoadLevelInfoFromLevelDir(char *level_directory, int start_entry)
   int i, current_entry = start_entry;
 
   if ((dir = opendir(level_directory)) == NULL)
-    Error(ERR_EXIT, "cannot read level directory '%s'", level_directory);
+  {
+    Error(ERR_WARN, "cannot read level directory '%s'", level_directory);
+    return current_entry;
+  }
 
   while (current_entry < MAX_LEVDIR_ENTRIES)
   {
@@ -1351,8 +1374,8 @@ static int LoadLevelInfoFromLevelDir(char *level_directory, int start_entry)
 
   closedir(dir);
 
-  if (current_entry == start_entry && start_entry != -1)
-    Error(ERR_EXIT, "cannot find any valid level series in directory '%s'",
+  if (current_entry == start_entry)
+    Error(ERR_WARN, "cannot find any valid level series in directory '%s'",
 	  level_directory);
 
   return current_entry;
@@ -1369,6 +1392,10 @@ void LoadLevelInfo()
 					    num_leveldirs);
   num_leveldirs = LoadLevelInfoFromLevelDir(getUserLevelDir(""),
 					    num_leveldirs);
+
+  if (num_leveldirs == 0)
+    Error(ERR_EXIT, "cannot find any valid level series in any directory");
+
   if (num_leveldirs > 1)
     qsort(leveldir, num_leveldirs, sizeof(struct LevelDirInfo),
 	  compareLevelDirInfoEntries);