X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=8e2152a25b399a8459fb0da24267b1d209214ea1;hb=cf2191ef8a66ae7bba91f80de8d2e6193af44dc4;hp=b9f9a3ae82b23eb72d8ec1069d69951cb1635cc3;hpb=3ff2e8a0b5c27b99a9920bdf5ed82bc41bf40181;p=rocksndiamonds.git

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index b9f9a3ae..8e2152a2 100644
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -30,7 +30,8 @@
 #include "hash.h"
 
 
-#define ENABLE_UNUSED_CODE	0	/* currently unused functions */
+#define USE_FILE_IDENTIFIERS	FALSE	/* do not use identifiers anymore */
+#define ENABLE_UNUSED_CODE	FALSE	/* for currently unused functions */
 
 #define NUM_LEVELCLASS_DESC	8
 
@@ -613,7 +614,7 @@ char *getCustomImageFilename(char *basename)
   if (!gfx.override_level_graphics)
   {
     /* 1st try: look for special artwork in current level series directory */
-    filename = getPath3(getCurrentLevelDir(), GRAPHICS_DIRECTORY, basename);
+    filename = getImg3(getCurrentLevelDir(), GRAPHICS_DIRECTORY, basename);
     if (fileExists(filename))
       return filename;
 
@@ -623,7 +624,7 @@ char *getCustomImageFilename(char *basename)
     if (getLevelArtworkSet(ARTWORK_TYPE_GRAPHICS) != NULL)
     {
       /* 2nd try: look for special artwork configured in level series config */
-      filename = getPath2(getLevelArtworkDir(ARTWORK_TYPE_GRAPHICS), basename);
+      filename = getImg2(getLevelArtworkDir(ARTWORK_TYPE_GRAPHICS), basename);
       if (fileExists(filename))
 	return filename;
 
@@ -637,7 +638,7 @@ char *getCustomImageFilename(char *basename)
   if (!skip_setup_artwork)
   {
     /* 3rd try: look for special artwork in configured artwork directory */
-    filename = getPath2(getSetupArtworkDir(artwork.gfx_current), basename);
+    filename = getImg2(getSetupArtworkDir(artwork.gfx_current), basename);
     if (fileExists(filename))
       return filename;
 
@@ -645,14 +646,14 @@ char *getCustomImageFilename(char *basename)
   }
 
   /* 4th try: look for default artwork in new default artwork directory */
-  filename = getPath2(getDefaultGraphicsDir(GFX_DEFAULT_SUBDIR), basename);
+  filename = getImg2(getDefaultGraphicsDir(GFX_DEFAULT_SUBDIR), basename);
   if (fileExists(filename))
     return filename;
 
   free(filename);
 
   /* 5th try: look for default artwork in old default artwork directory */
-  filename = getPath2(options.graphics_directory, basename);
+  filename = getImg2(options.graphics_directory, basename);
   if (fileExists(filename))
     return filename;
 
@@ -664,7 +665,7 @@ char *getCustomImageFilename(char *basename)
 
   /* 6th try: look for fallback artwork in old default artwork directory */
   /* (needed to prevent errors when trying to access unused artwork files) */
-  filename = getPath2(options.graphics_directory, GFX_FALLBACK_FILENAME);
+  filename = getImg2(options.graphics_directory, GFX_FALLBACK_FILENAME);
   if (fileExists(filename))
     return filename;
 #endif
@@ -2103,12 +2104,14 @@ SetupFileHash *loadSetupFileHash(char *filename)
 void checkSetupFileHashIdentifier(SetupFileHash *setup_file_hash,
 				  char *filename, char *identifier)
 {
+#if USE_FILE_IDENTIFIERS
   char *value = getHashEntry(setup_file_hash, TOKEN_STR_FILE_IDENTIFIER);
 
   if (value == NULL)
     Error(ERR_WARN, "config file '%s' has no file identifier", filename);
   else if (!checkCookieString(value, identifier))
     Error(ERR_WARN, "config file '%s' has wrong file identifier", filename);
+#endif
 }
 
 
@@ -2872,8 +2875,7 @@ static boolean LoadLevelInfoFromLevelConf(TreeInfo **node_first,
     (leveldir_new->user_defined || !leveldir_new->handicap ?
      leveldir_new->last_level : leveldir_new->first_level);
 
-  DrawInitTextExt(leveldir_new->name, 150, FC_YELLOW,
-		  leveldir_new->level_group);
+  DrawInitText(leveldir_new->name, 150, FC_YELLOW);
 
   pushTreeInfo(node_first, leveldir_new);
 
@@ -3024,9 +3026,7 @@ static boolean LoadArtworkInfoFromArtworkConf(TreeInfo **node_first,
     {
       while ((dir_entry = readDirectory(dir)) != NULL)
       {
-	char *entry_name = dir_entry->basename;
-
-	if (FileIsArtworkType(entry_name, type))
+	if (FileIsArtworkType(dir_entry->filename, type))
 	{
 	  valid_file_found = TRUE;
 
@@ -3339,8 +3339,7 @@ void LoadArtworkInfoFromLevelInfo(ArtworkDirTree **artwork_node,
 	setArtworkInfoCacheEntry(artwork_new, level_node, type);
     }
 
-    DrawInitTextExt(level_node->name, 150, FC_YELLOW,
-		    level_node->level_group);
+    DrawInitText(level_node->name, 150, FC_YELLOW);
 
     if (level_node->node_group != NULL)
       LoadArtworkInfoFromLevelInfo(artwork_node, level_node->node_group);