[iortcw] 286/497: SP: Handle the pak checks for the French version without a seperate build

[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 37af11598c44b7900ddc51be71d57e7eb8071628
Author: M4N4T4RMS at gmail.com <M4N4T4RMS at gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Thu Jan 29 20:07:45 2015 +0000

    SP: Handle the pak checks for the French version without a seperate build
---
 SP/Makefile             |  8 --------
 SP/code/qcommon/files.c | 18 ++++++++++++------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/SP/Makefile b/SP/Makefile
index d0c2bd8..f3c99fd 100644
--- a/SP/Makefile
+++ b/SP/Makefile
@@ -259,10 +259,6 @@ ifndef USE_OPENGLES
 USE_OPENGLES=0
 endif
 
-ifndef BUILD_FRENCH
-BUILD_FRENCH=0
-endif
-
 
 #############################################################################
 
@@ -1178,10 +1174,6 @@ ifeq ($(USE_BLOOM),1)
   CLIENT_CFLAGS += -DUSE_BLOOM
 endif
 
-ifeq ($(BUILD_FRENCH),1)
-  CLIENT_CFLAGS += -DBUILD_FRENCH
-endif
-
 BASE_CFLAGS += -DPRODUCT_VERSION=\\\"$(VERSION)\\\"
 BASE_CFLAGS += -Wformat=2 -Wformat-security -Wno-format-nonliteral
 BASE_CFLAGS += -Wstrict-aliasing=2 -Wmissing-format-attribute
diff --git a/SP/code/qcommon/files.c b/SP/code/qcommon/files.c
index 02a0862..c0dfe0d 100644
--- a/SP/code/qcommon/files.c
+++ b/SP/code/qcommon/files.c
@@ -184,13 +184,19 @@ static const unsigned int pak_checksums[] = {
 };
 
 static const unsigned int sppak_checksums[] = {
-#ifdef BUILD_FRENCH
-	2183777857u,
-#else
 	2837138611u,
-#endif
 	3033901371u,
-	483593179u
+	483593179u,
+	// sp_pak4.pk3 from GOTY edition
+//	4131017020
+};
+
+static const unsigned int fr_sppak_checksums[] = {
+	2183777857u,
+	3033901371u,
+	483593179u,
+	// sp_pak4.pk3 from GOTY edition
+//	4131017020
 };
 
 // if this is defined, the executable positively won't work with any paks other
@@ -3699,7 +3705,7 @@ static void FS_CheckSPPaks( void )
 				&& strlen(pakBasename) == 7 && !Q_stricmpn( pakBasename, "sp_pak", 6 )
 				&& pakBasename[6] >= '1' && pakBasename[6] <= '1' + NUM_SP_PAKS - 1)
 		{
-			if( curpack->checksum != sppak_checksums[pakBasename[6]-'1'] )
+			if( curpack->checksum != sppak_checksums[pakBasename[6]-'1'] && curpack->checksum != fr_sppak_checksums[pakBasename[6]-'1'] )
 			{
 				if(pakBasename[6] == '1')
 				{

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