diff options
| -rw-r--r-- | src/qcommon/qcommon.h | 2 | ||||
| -rw-r--r-- | src/qcommon/vm.c | 2 | ||||
| -rw-r--r-- | src/sys/sys_main.c | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/qcommon/qcommon.h b/src/qcommon/qcommon.h index 16b54e33..caabf7f4 100644 --- a/src/qcommon/qcommon.h +++ b/src/qcommon/qcommon.h @@ -1042,7 +1042,7 @@ typedef enum { void Sys_Init (void); // general development dll loading for virtual machine testing -void * QDECL Sys_LoadQVMDll( const char *name, intptr_t (QDECL **entryPoint)(int, ...), +void * QDECL Sys_LoadGameDll( const char *name, intptr_t (QDECL **entryPoint)(int, ...), intptr_t (QDECL *systemcalls)(intptr_t, ...) ); void Sys_UnloadDll( void *dllHandle ); diff --git a/src/qcommon/vm.c b/src/qcommon/vm.c index 536b2ff7..702bdd28 100644 --- a/src/qcommon/vm.c +++ b/src/qcommon/vm.c @@ -580,7 +580,7 @@ vm_t *VM_Create( const char *module, intptr_t (*systemCalls)(intptr_t *), { Com_Printf("Try loading dll file %s\n", filename); - vm->dllHandle = Sys_LoadQVMDll(filename, &vm->entryPoint, VM_DllSyscall); + vm->dllHandle = Sys_LoadGameDll(filename, &vm->entryPoint, VM_DllSyscall); if(vm->dllHandle) { diff --git a/src/sys/sys_main.c b/src/sys/sys_main.c index ea7fc0eb..abf05e6e 100644 --- a/src/sys/sys_main.c +++ b/src/sys/sys_main.c @@ -423,7 +423,7 @@ void *Sys_LoadDll(const char *name, qboolean useSystemLib) void *dllhandle; if(useSystemLib) - Com_Printf("Try loading \"%s\"...\n", name); + Com_Printf("Trying to load \"%s\"...\n", name); if(!useSystemLib || !(dllhandle = Sys_LoadLibrary(name))) { @@ -435,7 +435,7 @@ void *Sys_LoadDll(const char *name, qboolean useSystemLib) if(!*topDir) topDir = "."; - Com_Printf("Try loading \"%s\" from \"%s\"...\n", name, topDir); + Com_Printf("Trying to load \"%s\" from \"%s\"...\n", name, topDir); Com_sprintf(libPath, sizeof(libPath), "%s%c%s", topDir, PATH_SEP, name); if(!(dllhandle = Sys_LoadLibrary(libPath))) @@ -447,7 +447,7 @@ void *Sys_LoadDll(const char *name, qboolean useSystemLib) if(FS_FilenameCompare(topDir, basePath)) { - Com_Printf("Try loading \"%s\" from \"%s\"...\n", name, basePath); + Com_Printf("Trying to load \"%s\" from \"%s\"...\n", name, basePath); Com_sprintf(libPath, sizeof(libPath), "%s%c%s", basePath, PATH_SEP, name); dllhandle = Sys_LoadLibrary(libPath); } @@ -462,12 +462,12 @@ void *Sys_LoadDll(const char *name, qboolean useSystemLib) /* ================= -Sys_LoadQVMDll +Sys_LoadGameDll Used to load a development dll instead of a virtual machine ================= */ -void *Sys_LoadQVMDll(const char *name, +void *Sys_LoadGameDll(const char *name, intptr_t (QDECL **entryPoint)(int, ...), intptr_t (*systemcalls)(intptr_t, ...)) { @@ -481,7 +481,7 @@ void *Sys_LoadQVMDll(const char *name, if(!libHandle) { - Com_Printf("Sys_LoadQVMDll(%s) failed:\n\"%s\"\n", name, Sys_LibraryError()); + Com_Printf("Sys_LoadGameDll(%s) failed:\n\"%s\"\n", name, Sys_LibraryError()); return NULL; } @@ -490,13 +490,13 @@ void *Sys_LoadQVMDll(const char *name, if ( !*entryPoint || !dllEntry ) { - Com_Printf ( "Sys_LoadQVMDll(%s) failed to find vmMain function:\n\"%s\" !\n", name, Sys_LibraryError( ) ); + Com_Printf ( "Sys_LoadGameDll(%s) failed to find vmMain function:\n\"%s\" !\n", name, Sys_LibraryError( ) ); Sys_UnloadLibrary(libHandle); return NULL; } - Com_Printf ( "Sys_LoadQVMDll(%s) found vmMain function at %p\n", name, *entryPoint ); + Com_Printf ( "Sys_LoadGameDll(%s) found vmMain function at %p\n", name, *entryPoint ); dllEntry( systemcalls ); return libHandle; |