[quake3-commits] r2030 - trunk/code/qcommon

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2011-06-15 18:25:13 -0400 (Wed, 15 Jun 2011)
New Revision: 2030

Modified:
   trunk/code/qcommon/files.c
   trunk/code/qcommon/vm.c
Log:
- Don't try to load QVM/DLL files on pure servers
- Fallback after failed DLL load will be VMI_COMPILED, not INTERPRETED


Modified: trunk/code/qcommon/files.c
===================================================================
--- trunk/code/qcommon/files.c	2011-06-15 22:09:26 UTC (rev 2029)
+++ trunk/code/qcommon/files.c	2011-06-15 22:25:13 UTC (rev 2030)
@@ -1403,7 +1403,7 @@
         
 	while(search)
 	{
-		if(search->dir)
+		if(search->dir && !fs_numServerPaks)
 		{
 			dir = search->dir;
 

Modified: trunk/code/qcommon/vm.c
===================================================================
--- trunk/code/qcommon/vm.c	2011-06-15 22:09:26 UTC (rev 2029)
+++ trunk/code/qcommon/vm.c	2011-06-15 22:25:13 UTC (rev 2030)
@@ -622,7 +622,8 @@
 		interpret = VMI_BYTECODE;
 	}
 #else
-	if ( interpret >= VMI_COMPILED ) {
+	if(interpret != VMI_BYTECODE)
+	{
 		vm->compiled = qtrue;
 		VM_Compile( vm, header );
 	}