[iortcw] 07/152: All: Fix define for NUM_ID_PAKS

[Simon McVittie]

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

smcv pushed a commit to annotated tag 1.5a
in repository iortcw.

commit 4bd31fc708815373c3711d0365685bf90abe3cee
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date:   Sun Jan 3 12:53:25 2016 -0500

    All: Fix define for NUM_ID_PAKS
---
 MP/code/qcommon/files.c   | 2 +-
 MP/code/qcommon/qcommon.h | 2 +-
 SP/code/qcommon/files.c   | 2 +-
 SP/code/qcommon/qcommon.h | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/MP/code/qcommon/files.c b/MP/code/qcommon/files.c
index 71cd350..862350e 100644
--- a/MP/code/qcommon/files.c
+++ b/MP/code/qcommon/files.c
@@ -3250,7 +3250,7 @@ qboolean FS_idPak(char *pak, char *base, int numPaks) {
 		if ( !FS_FilenameCompare( pak, va( "%s/mp_pak%d",base,i ) ) ) {
 			break;
 		}
-		if ( !FS_FilenameCompare( pak, va( "%s/sp_pak%d",base,i ) ) ) {
+		if ( !FS_FilenameCompare( pak, va( "%s/sp_pak%d",base,i + 1) ) ) {
 			break;
 		}
 // jpw
diff --git a/MP/code/qcommon/qcommon.h b/MP/code/qcommon/qcommon.h
index fe5fa79..8ad2248 100644
--- a/MP/code/qcommon/qcommon.h
+++ b/MP/code/qcommon/qcommon.h
@@ -658,7 +658,7 @@ issues.
 #define FS_CGAME_REF    0x04
 // #define FS_QAGAME_REF   0x08
 // number of id paks that will never be autodownloaded from main
-#define NUM_ID_PAKS	1
+#define NUM_ID_PAKS	6
 #define NUM_MP_PAKS	6
 
 #define MAX_FILE_HANDLES    64
diff --git a/SP/code/qcommon/files.c b/SP/code/qcommon/files.c
index 101c44d..03a3e1d 100644
--- a/SP/code/qcommon/files.c
+++ b/SP/code/qcommon/files.c
@@ -3272,7 +3272,7 @@ qboolean FS_idPak(char *pak, char *base, int numPaks)
 		if ( !FS_FilenameCompare( pak, va( "%s/mp_pak%d",base,i ) ) ) {
 			break;
 		}
-		if ( !FS_FilenameCompare( pak, va( "%s/sp_pak%d",base,i ) ) ) {
+		if ( !FS_FilenameCompare( pak, va( "%s/sp_pak%d",base,i + 1) ) ) {
 			break;
 		}
 // jpw
diff --git a/SP/code/qcommon/qcommon.h b/SP/code/qcommon/qcommon.h
index 5c1818b..12c2da3 100644
--- a/SP/code/qcommon/qcommon.h
+++ b/SP/code/qcommon/qcommon.h
@@ -630,8 +630,8 @@ issues.
 #define FS_CGAME_REF    0x04
 // #define FS_QAGAME_REF   0x08
 // number of id paks that will never be autodownloaded from baseq3
-#define NUM_ID_PAKS	1
-#define NUM_SP_PAKS	4
+#define NUM_ID_PAKS	6
+#define NUM_SP_PAKS	5	// (+1...no sp_pak0)
 
 #define MAX_FILE_HANDLES    64
 

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