[quake3-commits] r2131 - in trunk/code: qcommon sys

[DONOTREPLY at icculus.org]

Author: tma
Date: 2011-08-03 10:32:49 -0400 (Wed, 03 Aug 2011)
New Revision: 2131

Modified:
   trunk/code/qcommon/qcommon.h
   trunk/code/qcommon/vm.c
   trunk/code/sys/sys_main.c
Log:
* Fix some grammar in DLL loading
* s/Sys_LoadQVMDll/Sys_LoadGameDll/

Modified: trunk/code/qcommon/qcommon.h
===================================================================
--- trunk/code/qcommon/qcommon.h	2011-08-03 00:58:33 UTC (rev 2130)
+++ trunk/code/qcommon/qcommon.h	2011-08-03 14:32:49 UTC (rev 2131)
@@ -1071,7 +1071,7 @@
 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 );
 

Modified: trunk/code/qcommon/vm.c
===================================================================
--- trunk/code/qcommon/vm.c	2011-08-03 00:58:33 UTC (rev 2130)
+++ trunk/code/qcommon/vm.c	2011-08-03 14:32:49 UTC (rev 2131)
@@ -579,7 +579,7 @@
 		{
 			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)
 			{

Modified: trunk/code/sys/sys_main.c
===================================================================
--- trunk/code/sys/sys_main.c	2011-08-03 00:58:33 UTC (rev 2130)
+++ trunk/code/sys/sys_main.c	2011-08-03 14:32:49 UTC (rev 2131)
@@ -422,7 +422,7 @@
 	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)))
 	{
@@ -434,7 +434,7 @@
 		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)))
@@ -446,7 +446,7 @@
 			
 			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);
 			}
@@ -461,12 +461,12 @@
 
 /*
 =================
-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, ...))
 {
@@ -480,7 +480,7 @@
 
 	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;
 	}
 
@@ -489,13 +489,13 @@
 
 	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;