[iortcw] 94/95: MP: Don't check whitelisted checksums when standalone

[Simon McVittie]

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

smcv pushed a commit to tag 1.51
in repository iortcw.

commit adbe1fa4595ae5067886f6a3332f55b57fb01913
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date:   Mon Jun 5 18:18:54 2017 -0400

    MP: Don't check whitelisted checksums when standalone
---
 MP/code/qcommon/files.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/MP/code/qcommon/files.c b/MP/code/qcommon/files.c
index b07ccca..275c0aa 100644
--- a/MP/code/qcommon/files.c
+++ b/MP/code/qcommon/files.c
@@ -1595,10 +1595,10 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, q
 			// that they can be referenced
 			if (Q_stricmp(name, "qagame"))
 			{
+				netpath = FS_BuildOSPath(fs_homepath->string, pack->pakGamename, dllName);
+#ifndef STANDALONE
 				int index;
 				qboolean whitelisted = qfalse;
-
-				netpath = FS_BuildOSPath(fs_homepath->string, pack->pakGamename, dllName);
 			
 				// Check whether this pak's checksum is on the whitelist
 				for(index = 0; index < ARRAY_LEN(binpak_checksums); index++)
@@ -1611,6 +1611,10 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, q
 
 				if (FS_FOpenFileReadDir(dllName, search, NULL, qfalse, unpure) > 0
 						&& whitelisted)
+#else
+				if (FS_FOpenFileReadDir(dllName, search, NULL, qfalse, unpure) > 0
+						&& FS_CL_ExtractFromPakFile(search, netpath, dllName, NULL))
+#endif
 				{
 					Com_Printf( "Loading %s dll from %s\n", name, pack->pakFilename );
 					Q_strncpyz(found, netpath, foundlen);

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