From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 12 Dec 2010 19:44:32 +0000 (+0000)
Subject: be more silent about self-pack
X-Git-Tag: xonotic-v0.5.0~438^2~185
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9887ee3f298c37c63811184d1ecf48d9acd8ddd1;p=xonotic%2Fdarkplaces.git

be more silent about self-pack

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10656 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/fs.c b/fs.c
index abe57f42..a0dd2c8e 100644
--- a/fs.c
+++ b/fs.c
@@ -669,7 +669,7 @@ FS_LoadPackPK3
 Create a package entry associated with a PK3 file
 ====================
 */
-pack_t *FS_LoadPackPK3FromFD (const char *packfile, int packhandle)
+pack_t *FS_LoadPackPK3FromFD (const char *packfile, int packhandle, qboolean silent)
 {
 	pk3_endOfCentralDir_t eocd;
 	pack_t *pack;
@@ -677,7 +677,8 @@ pack_t *FS_LoadPackPK3FromFD (const char *packfile, int packhandle)
 
 	if (! PK3_GetEndOfCentralDir (packfile, packhandle, &eocd))
 	{
-		Con_Printf ("%s is not a PK3 file\n", packfile);
+		if(!silent)
+			Con_Printf ("%s is not a PK3 file\n", packfile);
 		close(packhandle);
 		return NULL;
 	}
@@ -731,7 +732,7 @@ pack_t *FS_LoadPackPK3 (const char *packfile)
 #endif
 	if (packhandle < 0)
 		return NULL;
-	return FS_LoadPackPK3FromFD(packfile, packhandle);
+	return FS_LoadPackPK3FromFD(packfile, packhandle, false);
 }
 
 
@@ -1626,7 +1627,7 @@ void FS_Init_SelfPack (void)
 	fs_mempool = Mem_AllocPool("file management", 0, NULL);
 	if(com_selffd >= 0)
 	{
-		fs_selfpack = FS_LoadPackPK3FromFD(com_argv[0], com_selffd);
+		fs_selfpack = FS_LoadPackPK3FromFD(com_argv[0], com_selffd, true);
 		if(fs_selfpack)
 		{
 			char *buf, *q;