cleanup of drawing init text

[rocksndiamonds.git] / src / libgame / setup.c

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index b9f9a3ae82b23eb72d8ec1069d69951cb1635cc3..e60c8424f5409b67334bc5894912ae4390877212 100644 (file)
--- 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
 
@@ -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);
 
@@ -3339,8 +3341,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);