deactivated some debug messages

diff --git a/src/game_em/convert.c b/src/game_em/convert.c
index cbc7187925b9e5933d9a6b54da378ee7fa2f59a1..c5f563b2397ca4012d752b959becd298e89f86df 100644 (file)
--- a/src/game_em/convert.c
+++ b/src/game_em/convert.c
@@ -454,8 +454,10 @@ int cleanup_em_level(unsigned char *src, int length, char *filename)
   /* size of v6 cave */
   length = 2172;
 
+#if 0
   if (options.debug)
-    printf("::: EM level file version: %d\n", file_version);
+    Error(ERR_DEBUG, "EM level file version: %d", file_version);
+#endif
 
   return file_version;
 }

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index 1d5a83bfffabcc9c064861e4c20c6ad292026282..de23a94035ee2ef5da704d97a06e53ec43f21b8a 100644 (file)
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -31,6 +31,7 @@
 
 
 #define ENABLE_UNUSED_CODE     FALSE   /* for currently unused functions */
+#define DEBUG_NO_CONFIG_FILE   FALSE   /* for extra-verbose debug output */
 
 #define NUM_LEVELCLASS_DESC    8
 
@@ -2024,7 +2025,9 @@ static boolean loadSetupFileData(void *setup_file_data, char *filename,
 
   if (!(file = openFile(filename, MODE_READ)))
   {
+#if DEBUG_NO_CONFIG_FILE
     Error(ERR_DEBUG, "cannot open configuration file '%s'", filename);
+#endif
 
     return FALSE;
   }
@@ -2966,7 +2969,9 @@ static boolean LoadLevelInfoFromLevelConf(TreeInfo **node_first,
 
   if (setup_file_hash == NULL)
   {
+#if DEBUG_NO_CONFIG_FILE
     Error(ERR_WARN, "ignoring level directory '%s'", directory_path);
+#endif
 
     free(directory_path);
     free(filename);
@@ -3204,8 +3209,10 @@ static boolean LoadArtworkInfoFromArtworkConf(TreeInfo **node_first,
 
     if (!valid_file_found)
     {
+#if DEBUG_NO_CONFIG_FILE
       if (!strEqual(directory_name, "."))
        Error(ERR_WARN, "ignoring artwork directory '%s'", directory_path);
+#endif
 
       free(directory_path);
       free(filename);

diff --git a/src/libgame/system.c b/src/libgame/system.c
index 5888f344a81c9cbd4585fdadff54f0a27b89d1fb..cfd1f8717b3de795c176e460426413dce71205c2 100644 (file)
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -122,6 +122,7 @@ void InitScoresInfo()
   program.global_scores = directoryExists(global_scores_dir);
   program.many_scores_per_name = !program.global_scores;
 
+#if 0
   if (options.debug)
   {
     if (program.global_scores)
@@ -136,6 +137,7 @@ void InitScoresInfo()
       Error(ERR_DEBUG, "Using private, single-user scores directory.");
     }
   }
+#endif
 
   free(global_scores_dir);
 }