Message cleanup with M_Pretty

skyjake · Aug 15, 2003 · d2be87f · d2be87f
1 parent b26e4fd
commit d2be87f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/doomsday/Src/dd_wad.c b/doomsday/Src/dd_wad.c
@@ -473,7 +473,7 @@ boolean W_AddFile(const char *filename, boolean allowDuplicate)
 		return false;
 	}
 
-	Con_Message("W_AddFile: %s\n", filename);
+	Con_Message("W_AddFile: %s\n", M_Pretty(filename));
 
 	// Determine the file name extension.
 	extension = strrchr(filename, '.');

diff --git a/doomsday/Src/dd_zip.c b/doomsday/Src/dd_zip.c
@@ -326,12 +326,13 @@ boolean Zip_Open(const char *fileName, DFILE *prevOpened)
 		file = prevOpened;
 	}
 
-	VERBOSE( Con_Message("Zip_Open: %s\n", fileName) );
+	VERBOSE( Con_Message("Zip_Open: %s\n", M_Pretty(fileName)) );
 
 	// Scan the end of the file for the central directory end record.
 	if(!Zip_LocateCentralDirectory(file))
 	{
-		Con_Error("Zip_Open: %s: Central directory not found.\n", fileName);
+		Con_Error("Zip_Open: %s: Central directory not found.\n", 
+			M_Pretty(fileName));
 	}
 
 	// Read the central directory end record.
@@ -341,7 +342,7 @@ boolean Zip_Open(const char *fileName, DFILE *prevOpened)
 	if(summary.diskEntryCount != summary.totalEntryCount)
 	{
 		Con_Error("Zip_Open: %s: Multipart Zip files are not supported.\n", 
-			fileName);
+			M_Pretty(fileName));
 	}
 
 	// Read the entire central directory into memory.
@@ -376,12 +377,12 @@ boolean Zip_Open(const char *fileName, DFILE *prevOpened)
 			|| header->compressedSize != header->size)
 		{
 			Con_Error("Zip_Open: %s: '%s' is compressed.\n  Compression is "
-				"not supported.\n", fileName, buf);
+				"not supported.\n", M_Pretty(fileName), buf);
 		}
 		if(header->flags & ZFH_ENCRYPTED)
 		{
 			Con_Error("Zip_Open: %s: '%s' is encrypted.\n  Encryption is "
-				"not supported.\n", fileName, buf);
+				"not supported.\n", M_Pretty(fileName), buf);
 		}
 
 		// Convert all slashes to backslashes, for compatibility with 
@@ -540,7 +541,7 @@ uint Zip_Read(zipindex_t index, void *buffer)
 	pack = entry->package;
 
 	VERBOSE2( Con_Printf("Zip_Read: %s: '%s' (%i bytes)\n",
-		pack->name, entry->name, entry->size) );
+		M_Pretty(pack->name), M_Pretty(entry->name), entry->size) );
 
 	F_Seek(pack->file, entry->offset, SEEK_SET);
 	F_Read(buffer, entry->size, pack->file);

diff --git a/doomsday/Src/gl_font.c b/doomsday/Src/gl_font.c
@@ -324,7 +324,7 @@ int FR_PrepareFont(char *name)
 		return false;
 	}
 
-	if(verbose) Con_Message("FR_PrepareFont: %s\n", buf); 
+	if(verbose) Con_Message("FR_PrepareFont: %s\n", M_Pretty(buf)); 
 
 	version = InByte(file);
 

diff --git a/doomsday/Src/r_extres.c b/doomsday/Src/r_extres.c
@@ -106,7 +106,7 @@ void R_SetDataPath(const char *path)
 
 	M_TranslatePath(path, dataPath);
 	Dir_ValidDir(dataPath);
-	VERBOSE( Con_Message("R_SetDataPath: %s\n", dataPath) );
+	VERBOSE( Con_Message("R_SetDataPath: %s\n", M_Pretty(dataPath)) );
 
 	// Update the paths of each class.
 	memset(classInfo, 0, sizeof(classInfo));
@@ -134,7 +134,8 @@ void R_SetDataPath(const char *path)
 		}
 
 		VERBOSE2( Con_Message("  %i: %s (%s)\n", i, 
-			classInfo[i].path, classInfo[i].overridePath) );
+			M_Pretty(classInfo[i].path), 
+			M_Pretty(classInfo[i].overridePath)) );
 	}
 }
 

diff --git a/doomsday/Src/sys_direc.c b/doomsday/Src/sys_direc.c
@@ -57,7 +57,7 @@ int Dir_ChDir(directory_t *dir)
 	success = !_chdir(dir->path); // Successful if == 0.
 
 	VERBOSE2( Con_Printf("Dir_ChDir: %s: %s\n", 
-		success? "Succeeded" : "Failed", dir->path) );
+		success? "Succeeded" : "Failed", M_Pretty(dir->path)) );
 
 	return success;
 }