okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Merge unified-sdl to trunk

Browse source 
* Bump Q3_VERSION to 1.35
This commit is contained in:
Tim Angus 2007-09-05 18:17:46 +00:00
parent 39abffeb3b
commit 672cfbf16f
188 changed files with 5071 additions and 41739 deletions
Download patch file Download diff file Expand all files Collapse all files

17
code/qcommon/vm.c
View file

@ -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;
}