[iortcw] 101/497: MP: Look for QVM first when vm_xxx is set to 2
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 733a206050ae5fb9fd4772b70e7a58113319feec
Author: m4n4t4...@gmail.com
Date: Sat May 3 22:41:57 2014 +
MP: Look for QVM first when vm_xxx is set to 2
---
MP/code/qcommon/vm.c | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/MP/code/qcommon/vm.c b/MP/code/qcommon/vm.c
index 6594598..3bf200e 100644
--- a/MP/code/qcommon/vm.c
+++ b/MP/code/qcommon/vm.c
@@ -631,7 +631,16 @@ vm_t *VM_Create( const char *module, intptr_t
(*systemCalls)(intptr_t *),
{
retval = FS_FindVM(&startSearch, filename, sizeof(filename),
module, !pureVM, (interpret != VMI_NATIVE));
- if(retval == VMI_NATIVE)
+ if(retval == VMI_COMPILED)
+ {
+ vm->searchPath = startSearch;
+ if((header = VM_LoadQVM(vm, qtrue, qfalse)))
+ break;
+
+ // VM_Free overwrites the name on failed load
+ Q_strncpyz(vm->name, module, sizeof(vm->name));
+ }
+ else if(retval == VMI_NATIVE)
{
Com_Printf("Try loading dll file %s\n", filename);
@@ -645,15 +654,6 @@ vm_t *VM_Create( const char *module, intptr_t
(*systemCalls)(intptr_t *),
Com_Printf("Failed loading dll, trying next\n");
}
- else if(retval == VMI_COMPILED)
- {
- vm->searchPath = startSearch;
- if((header = VM_LoadQVM(vm, qtrue, qfalse)))
- break;
-
- // VM_Free overwrites the name on failed load
- Q_strncpyz(vm->name, module, sizeof(vm->name));
- }
else if ( pureServer && pureVM )
{
Com_Printf( "Failed to find pure %s VM, trying
unpure\n", module );
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[iortcw] 101/497: MP: Look for QVM first when vm_xxx is set to 2
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 733a206050ae5fb9fd4772b70e7a58113319feec
Author: m4n4t4...@gmail.com
Date: Sat May 3 22:41:57 2014 +
MP: Look for QVM first when vm_xxx is set to 2
---
MP/code/qcommon/vm.c | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/MP/code/qcommon/vm.c b/MP/code/qcommon/vm.c
index 6594598..3bf200e 100644
--- a/MP/code/qcommon/vm.c
+++ b/MP/code/qcommon/vm.c
@@ -631,7 +631,16 @@ vm_t *VM_Create( const char *module, intptr_t
(*systemCalls)(intptr_t *),
{
retval = FS_FindVM(&startSearch, filename, sizeof(filename),
module, !pureVM, (interpret != VMI_NATIVE));
- if(retval == VMI_NATIVE)
+ if(retval == VMI_COMPILED)
+ {
+ vm->searchPath = startSearch;
+ if((header = VM_LoadQVM(vm, qtrue, qfalse)))
+ break;
+
+ // VM_Free overwrites the name on failed load
+ Q_strncpyz(vm->name, module, sizeof(vm->name));
+ }
+ else if(retval == VMI_NATIVE)
{
Com_Printf("Try loading dll file %s\n", filename);
@@ -645,15 +654,6 @@ vm_t *VM_Create( const char *module, intptr_t
(*systemCalls)(intptr_t *),
Com_Printf("Failed loading dll, trying next\n");
}
- else if(retval == VMI_COMPILED)
- {
- vm->searchPath = startSearch;
- if((header = VM_LoadQVM(vm, qtrue, qfalse)))
- break;
-
- // VM_Free overwrites the name on failed load
- Q_strncpyz(vm->name, module, sizeof(vm->name));
- }
else if ( pureServer && pureVM )
{
Com_Printf( "Failed to find pure %s VM, trying
unpure\n", module );
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
