diff options
author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-09-05 18:17:46 +0000 |
---|---|---|
committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-09-05 18:17:46 +0000 |
commit | d37536edf4660f3c46e4876b6d72e9a200549ffe (patch) | |
tree | 637eb5f3e49f4075ecdef97a31f5e8157cee73a2 /code/qcommon/vm.c | |
parent | 4496eacc4ec7406fd694693da5a7f9589933f7fd (diff) | |
download | ioquake3-aero-d37536edf4660f3c46e4876b6d72e9a200549ffe.tar.gz ioquake3-aero-d37536edf4660f3c46e4876b6d72e9a200549ffe.zip |
* Merge unified-sdl to trunk
* Bump Q3_VERSION to 1.35
git-svn-id: svn://svn.icculus.org/quake3/trunk@1161 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/qcommon/vm.c')
-rw-r--r-- | code/qcommon/vm.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/code/qcommon/vm.c b/code/qcommon/vm.c index 0e35791..ecc29c1 100644 --- a/code/qcommon/vm.c +++ b/code/qcommon/vm.c @@ -36,8 +36,8 @@ and one exported function: Perform #include "vm_local.h" -vm_t *currentVM = NULL; // bk001212 -vm_t *lastVM = NULL; // bk001212 +vm_t *currentVM = NULL; +vm_t *lastVM = NULL; int vm_debugLevel; #define MAX_VM 3 @@ -543,13 +543,6 @@ vm_t *VM_Create( const char *module, intptr_t (*systemCalls)(intptr_t *), Q_strncpyz( vm->name, module, sizeof( vm->name ) ); vm->systemCall = systemCalls; - // never allow dll loading with a demo - if ( interpret == VMI_NATIVE ) { - if ( Cvar_VariableValue( "fs_restrict" ) ) { - interpret = VMI_COMPILED; - } - } - if ( interpret == VMI_NATIVE ) { // try to load as a system dll Com_Printf( "Loading dll file %s.\n", vm->name ); @@ -655,7 +648,7 @@ void *VM_ArgPtr( intptr_t intValue ) { if ( !intValue ) { return NULL; } - // bk001220 - currentVM is missing on reconnect + // currentVM is missing on reconnect if ( currentVM==NULL ) return NULL; @@ -672,7 +665,7 @@ void *VM_ExplicitArgPtr( vm_t *vm, intptr_t intValue ) { return NULL; } - // bk010124 - currentVM is missing on reconnect here as well? + // currentVM is missing on reconnect here as well? if ( currentVM==NULL ) return NULL; @@ -773,7 +766,7 @@ intptr_t QDECL VM_Call( vm_t *vm, int callnum, ... ) { #endif } - if ( oldVM != NULL ) // bk001220 - assert(currentVM!=NULL) for oldVM==NULL + if ( oldVM != NULL ) currentVM = oldVM; return r; } |