[iortcw] 464/497: All: Print the names of any missing pk3 files

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit afcb9336b97205fda2d6ff0452fadc6669bccc6b
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date:   Sun Dec 6 14:23:01 2015 -0500

    All: Print the names of any missing pk3 files
---
 MP/code/qcommon/files.c | 14 +++++++++++---
 SP/code/qcommon/files.c | 14 +++++++++++---
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/MP/code/qcommon/files.c b/MP/code/qcommon/files.c
index a17cdbe..62400e8 100644
--- a/MP/code/qcommon/files.c
+++ b/MP/code/qcommon/files.c
@@ -3700,12 +3700,20 @@ static void FS_CheckMPPaks( void )
 	if(!com_standalone->integer && (foundPak & 0x3f) != 0x3f)
 	{
 		char errorText[MAX_STRING_CHARS] = "";
+		char missingPaks[MAX_STRING_CHARS] = "";
+		int i = 0;
 
 		if((foundPak & 0x3f) != 0x3f)
 		{
-			Q_strcat(errorText, sizeof(errorText),
-				"\n\nPoint Release files are missing. Please\n"
-				"re-install the 1.41 point release.\n\n");
+			for( i = 0; i < NUM_MP_PAKS; i++ ) {
+				if ( !( foundPak & ( 1 << i ) ) ) {
+					Q_strcat( missingPaks, sizeof( missingPaks ), va( "mp_pak%d.pk3 ", i ) );
+				}
+			}
+
+			Q_strcat( errorText, sizeof( errorText ),
+				va( "\n\nPoint Release files are missing: %s \n"
+				"Please re-install the 1.41 point release.\n\n", missingPaks ) );
 		}
 
 		Com_Error(ERR_FATAL, "%s", errorText);
diff --git a/SP/code/qcommon/files.c b/SP/code/qcommon/files.c
index 0a00edb..268e180 100644
--- a/SP/code/qcommon/files.c
+++ b/SP/code/qcommon/files.c
@@ -3730,12 +3730,20 @@ static void FS_CheckSPPaks( void )
 	if(!com_standalone->integer && (foundPak & 0xf) != 0xf)
 	{
 		char errorText[MAX_STRING_CHARS] = "";
+		char missingPaks[MAX_STRING_CHARS] = "";
+		int i = 0;
 
 		if((foundPak & 0xf) != 0xf)
 		{
-			Q_strcat(errorText, sizeof(errorText),
-				"\n\nPoint Release files are missing. Please\n"
-				"re-install the 1.41 point release.\n\n");
+			for( i = 0; i < NUM_SP_PAKS; i++ ) {
+				if ( !( foundPak & ( 1 << i ) ) ) {
+					Q_strcat( missingPaks, sizeof( missingPaks ), va( "sp_pak%d.pk3 ", i + 1 ) );
+				}
+			}
+
+			Q_strcat( errorText, sizeof( errorText ),
+				va( "\n\nPoint Release files are missing: %s \n"
+				"Please re-install the 1.41 point release.\n\n", missingPaks ) );
 		}
 
 		Com_Error(ERR_FATAL, "%s", errorText);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git