X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=7e34711afcbb0719f258cf1e2e0384a2b71e8e04;hb=ac9feee5631d3725a6d7b75b065c8be33a22d4b5;hp=ccbd2ed5ce6b36bd27db430584f8e2d31ccf78c7;hpb=c9c4509483fdd52fb18925662c295ba5610237ed;p=rocksndiamonds.git

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index ccbd2ed5..7e34711a 100644
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -70,6 +70,7 @@ static int token_comment_position = TOKEN_COMMENT_POSITION_DEFAULT;
 static SetupFileHash *artworkinfo_cache_old = NULL;
 static SetupFileHash *artworkinfo_cache_new = NULL;
 static SetupFileHash *optional_tokens_hash = NULL;
+static SetupFileHash *missing_file_hash = NULL;
 static boolean use_artworkinfo_cache = TRUE;
 static boolean update_artworkinfo_cache = FALSE;
 
@@ -78,6 +79,16 @@ static boolean update_artworkinfo_cache = FALSE;
 // file functions
 // ----------------------------------------------------------------------------
 
+static void WarnUsingFallback(char *filename)
+{
+  if (getHashEntry(missing_file_hash, filename) == NULL)
+  {
+    setHashEntry(missing_file_hash, filename, "");
+
+    Warn("cannot find artwork file '%s' (using fallback)", filename);
+  }
+}
+
 static char *getLevelClassDescription(TreeInfo *ti)
 {
   int position = ti->sort_priority / 100;
@@ -884,6 +895,34 @@ char *getCreditsFilename(int nr, boolean global)
   return NULL;		// cannot find credits file
 }
 
+static char *getProgramInfoBasename(int nr)
+{
+  static char basename[32];
+
+  sprintf(basename, "program_%d.txt", nr + 1);
+
+  return basename;
+}
+
+char *getProgramInfoFilename(int nr)
+{
+  char *basename = getProgramInfoBasename(nr);
+  static char *info_subdir = NULL;
+  static char *filename = NULL;
+
+  if (info_subdir == NULL)
+    info_subdir = getPath2(DOCS_DIRECTORY, INFO_DIRECTORY);
+
+  checked_free(filename);
+
+  // look for program info file in the game's base directory
+  filename = getPath3(options.base_directory, info_subdir, basename);
+  if (fileExists(filename))
+    return filename;
+
+  return NULL;		// cannot find program info file
+}
+
 static char *getCorrectedArtworkBasename(char *basename)
 {
   return basename;
@@ -948,7 +987,7 @@ char *getCustomImageFilename(char *basename)
   {
     free(filename);
 
-    Warn("cannot find artwork file '%s' (using fallback)", basename);
+    WarnUsingFallback(basename);
 
     // 6th try: look for fallback artwork in old default artwork directory
     // (needed to prevent errors when trying to access unused artwork files)
@@ -1019,7 +1058,7 @@ char *getCustomSoundFilename(char *basename)
   {
     free(filename);
 
-    Warn("cannot find artwork file '%s' (using fallback)", basename);
+    WarnUsingFallback(basename);
 
     // 6th try: look for fallback artwork in old default artwork directory
     // (needed to prevent errors when trying to access unused artwork files)
@@ -1090,7 +1129,7 @@ char *getCustomMusicFilename(char *basename)
   {
     free(filename);
 
-    Warn("cannot find artwork file '%s' (using fallback)", basename);
+    WarnUsingFallback(basename);
 
     // 6th try: look for fallback artwork in old default artwork directory
     // (needed to prevent errors when trying to access unused artwork files)
@@ -1214,6 +1253,14 @@ boolean CheckTapeDirectoryUploadsComplete(char *level_subdir)
   return success;
 }
 
+void InitMissingFileHash(void)
+{
+  if (missing_file_hash == NULL)
+    freeSetupFileHash(missing_file_hash);
+
+  missing_file_hash = newSetupFileHash();
+}
+
 void InitTapeDirectory(char *level_subdir)
 {
   boolean new_tape_dir = !directoryExists(getTapeDir(level_subdir));
@@ -1728,7 +1775,7 @@ char *getHomeDir(void)
       strcpy(dir, ".");
   }
 #elif defined(PLATFORM_EMSCRIPTEN)
-  dir = "/persistent";
+  dir = PERSISTENT_DIRECTORY;
 #elif defined(PLATFORM_UNIX)
   if (dir == NULL)
   {
@@ -2608,11 +2655,13 @@ SetupFileHash *loadSetupFileHash(char *filename)
 #define LEVELINFO_TOKEN_FILENAME		24
 #define LEVELINFO_TOKEN_FILETYPE		25
 #define LEVELINFO_TOKEN_SPECIAL_FLAGS		26
-#define LEVELINFO_TOKEN_HANDICAP		27
-#define LEVELINFO_TOKEN_SKIP_LEVELS		28
-#define LEVELINFO_TOKEN_USE_EMC_TILES		29
+#define LEVELINFO_TOKEN_EMPTY_LEVEL_NAME	27
+#define LEVELINFO_TOKEN_FORCE_LEVEL_NAME	28
+#define LEVELINFO_TOKEN_HANDICAP		29
+#define LEVELINFO_TOKEN_SKIP_LEVELS		30
+#define LEVELINFO_TOKEN_USE_EMC_TILES		31
 
-#define NUM_LEVELINFO_TOKENS			30
+#define NUM_LEVELINFO_TOKENS			32
 
 static LevelDirTree ldi;
 
@@ -2646,6 +2695,8 @@ static struct TokenInfo levelinfo_tokens[] =
   { TYPE_STRING,	&ldi.level_filename,	"filename"		},
   { TYPE_STRING,	&ldi.level_filetype,	"filetype"		},
   { TYPE_STRING,	&ldi.special_flags,	"special_flags"		},
+  { TYPE_STRING,	&ldi.empty_level_name,	"empty_level_name"	},
+  { TYPE_BOOLEAN,	&ldi.force_level_name,	"force_level_name"	},
   { TYPE_BOOLEAN,	&ldi.handicap,		"handicap"		},
   { TYPE_BOOLEAN,	&ldi.skip_levels,	"skip_levels"		},
   { TYPE_BOOLEAN,	&ldi.use_emc_tiles,	"use_emc_tiles"		}
@@ -2743,6 +2794,9 @@ static void setTreeInfoToDefaults(TreeInfo *ti, int type)
 
     ti->special_flags = NULL;
 
+    ti->empty_level_name = NULL;
+    ti->force_level_name = FALSE;
+
     ti->levels = 0;
     ti->first_level = 0;
     ti->last_level = 0;
@@ -2825,6 +2879,9 @@ static void setTreeInfoToDefaultsFromParent(TreeInfo *ti, TreeInfo *parent)
 
     ti->special_flags = getStringCopy(parent->special_flags);
 
+    ti->empty_level_name = getStringCopy(parent->empty_level_name);
+    ti->force_level_name = parent->force_level_name;
+
     ti->levels = parent->levels;
     ti->first_level = parent->first_level;
     ti->last_level = parent->last_level;
@@ -2887,6 +2944,9 @@ static TreeInfo *getTreeInfoCopy(TreeInfo *ti)
 
   ti_copy->special_flags	= getStringCopy(ti->special_flags);
 
+  ti_copy->empty_level_name	= getStringCopy(ti->empty_level_name);
+  ti_copy->force_level_name	= ti->force_level_name;
+
   ti_copy->levels		= ti->levels;
   ti_copy->first_level		= ti->first_level;
   ti_copy->last_level		= ti->last_level;