[iortcw] 09/497: MP: Properly handle vm_* cvars / Always extract dlls from mp_bin so they can be found

[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 1811d3fc5630a6c000fca00e942329027eb1b7ff
Author: M4N4T4RMS at gmail.com <M4N4T4RMS at gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Sat Jan 18 15:19:11 2014 +0000

    MP: Properly handle vm_* cvars / Always extract dlls from mp_bin so they can be found
---
 MP/code/qcommon/files.c | 4 ++--
 MP/code/qcommon/vm.c    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/MP/code/qcommon/files.c b/MP/code/qcommon/files.c
index 217bb16..dc3dd9b 100644
--- a/MP/code/qcommon/files.c
+++ b/MP/code/qcommon/files.c
@@ -1574,9 +1574,9 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, q
 		        }
 
 #ifndef DEDICATED
-			// if the server is pure, extract the dlls from the mp_bin.pk3 so
+			// extract the dlls from the mp_bin.pk3 so
 			// that they can be referenced
-			if (cl_connectedToPureServer && Q_stricmp(name, "qagame"))
+			if (Q_stricmp(name, "qagame"))
 			{
 				netpath = FS_BuildOSPath(fs_homepath->string, pack->pakGamename, dllName);
 
diff --git a/MP/code/qcommon/vm.c b/MP/code/qcommon/vm.c
index 6594598..00e0936 100644
--- a/MP/code/qcommon/vm.c
+++ b/MP/code/qcommon/vm.c
@@ -629,7 +629,7 @@ vm_t *VM_Create( const char *module, intptr_t (*systemCalls)(intptr_t *),
 
 	do
 	{
-		retval = FS_FindVM(&startSearch, filename, sizeof(filename), module, !pureVM, (interpret != VMI_NATIVE));
+		retval = FS_FindVM(&startSearch, filename, sizeof(filename), module, pureVM, (interpret != VMI_NATIVE));
 		
 		if(retval == VMI_NATIVE)
 		{

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