diff options
| author | Thilo Schulz <arny@ats.s.bawue.de> | 2011-06-15 22:25:13 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-10 21:28:20 +0000 |
| commit | 2dd04e69725fcb96b43aeac13aa03c8a863e9cd3 (patch) | |
| tree | b12daba955e46f25c20066aa9da76e3b122cd2c7 /src/qcommon | |
| parent | fad34584b3019a9c46b4b2255e6428ffc3aa04b3 (diff) | |
- Don't try to load QVM/DLL files on pure servers - Fallback after failed DLL load will be VMI_COMPILED, not INTERPRETED
Diffstat (limited to 'src/qcommon')
| -rw-r--r-- | src/qcommon/files.c | 2 | ||||
| -rw-r--r-- | src/qcommon/vm.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/qcommon/files.c b/src/qcommon/files.c index 66cef9a3..e2ca20d0 100644 --- a/src/qcommon/files.c +++ b/src/qcommon/files.c @@ -1370,7 +1370,7 @@ vmInterpret_t FS_FindVM(void **startSearch, char *found, int foundlen, const cha while(search) { - if(search->dir) + if(search->dir && !fs_numServerPaks) { dir = search->dir; diff --git a/src/qcommon/vm.c b/src/qcommon/vm.c index c53d8067..ce131c2b 100644 --- a/src/qcommon/vm.c +++ b/src/qcommon/vm.c @@ -623,7 +623,8 @@ vm_t *VM_Create( const char *module, intptr_t (*systemCalls)(intptr_t *), interpret = VMI_BYTECODE; } #else - if ( interpret >= VMI_COMPILED ) { + if(interpret != VMI_BYTECODE) + { vm->compiled = qtrue; VM_Compile( vm, header ); } |