r109 - in trunk: . code/qcommon code/renderer code/win32

[DONOTREPLY at icculus.org]

Author: zakk
Date: 2005-09-25 22:36:52 -0400 (Sun, 25 Sep 2005)
New Revision: 109

Modified:
   trunk/code/qcommon/vm_x86.c
   trunk/code/renderer/tr_model.c
   trunk/code/win32/win_main.c
   trunk/i_o-q3-readme
Log:
Hopefully this will fix win32 msvc.netsuperduper++220000 extra entropy edition
compilation, and I updated the readme a little apparently.


Modified: trunk/code/qcommon/vm_x86.c
===================================================================
--- trunk/code/qcommon/vm_x86.c	2005-09-25 22:27:26 UTC (rev 108)
+++ trunk/code/qcommon/vm_x86.c	2005-09-26 02:36:52 UTC (rev 109)
@@ -60,10 +60,10 @@
 static	int		ftolPtr = (int)_ftol;
 #endif
 
-void doAsmCall( void );
-static	int		asmCallPtr = (int)doAsmCall;
+void AsmCall( void );
+static	int		asmCallPtr = (int)AsmCall;
 
-#else // _WIN32
+#else // _MSC_VER
 
 #if defined( FTOL_PTR )
 // bk001213 - BEWARE: does not work! UI menu etc. broken - stack!
@@ -79,8 +79,8 @@
 static	int		ftolPtr = (int)qftol0F7F;
 #endif // FTOL_PTR
 
-void doAsmCall( void );
-static	int		asmCallPtr = (int)doAsmCall;
+void AsmCall( void );
+static	int		asmCallPtr = (int)AsmCall;
 #endif // !_WIN32
 
 
@@ -198,7 +198,7 @@
 }
 
 void AsmCall( void ) {
-	asm( CMANG(doAsmCall) ":				\n\t" \
+	asm( CMANG(AsmCall) ":				\n\t" \
 		"	movl (%%edi),%%eax			\n\t" \
 		"	subl $4,%%edi				\n\t" \
 		"	orl %%eax,%%eax				\n\t" \

Modified: trunk/code/renderer/tr_model.c
===================================================================
--- trunk/code/renderer/tr_model.c	2005-09-25 22:27:26 UTC (rev 108)
+++ trunk/code/renderer/tr_model.c	2005-09-26 02:36:52 UTC (rev 109)
@@ -180,9 +180,9 @@
 
 	for ( lod = MD3_MAX_LODS - 1 ; lod >= 0 ; lod-- ) {
 		if ( lod )
-			snprintf(namebuf, sizeof(namebuf), "%s_%d.%s", filename, lod, fext);
+			Com_sprintf(namebuf, sizeof(namebuf), "%s_%d.%s", filename, lod, fext);
 		else
-			snprintf(namebuf, sizeof(namebuf), "%s.%s", filename, fext);
+			Com_sprintf(namebuf, sizeof(namebuf), "%s.%s", filename, fext);
 
 		ri.FS_ReadFile( namebuf, (void **)&buf );
 		if ( !buf ) {

Modified: trunk/code/win32/win_main.c
===================================================================
--- trunk/code/win32/win_main.c	2005-09-25 22:27:26 UTC (rev 108)
+++ trunk/code/win32/win_main.c	2005-09-26 02:36:52 UTC (rev 109)
@@ -606,8 +606,8 @@
 	}
 #endif
 
-	dllEntry = ( void (QDECL *)( int (QDECL *)( int, ... ) ) )GetProcAddress( libHandle, "dllEntry" ); 
-	*entryPoint = (int (QDECL *)(int,...))GetProcAddress( libHandle, "vmMain" );
+	dllEntry = ( void (QDECL *)(long (QDECL *)( long, ... ) ) )GetProcAddress( libHandle, "dllEntry" ); 
+	*entryPoint = (long (QDECL *)(long,...))GetProcAddress( libHandle, "vmMain" );
 	if ( !*entryPoint || !dllEntry ) {
 		FreeLibrary( libHandle );
 		return NULL;

Modified: trunk/i_o-q3-readme
===================================================================
--- trunk/i_o-q3-readme	2005-09-25 22:27:26 UTC (rev 108)
+++ trunk/i_o-q3-readme	2005-09-26 02:36:52 UTC (rev 109)
@@ -4,6 +4,9 @@
 I'll be your maintainer, zakk at icculus.org, please send all your patches to 
 the bugzilla: https://bugzilla.icculus.org, or join the mailing list 
 (quake3-subscribe at icculus.org) and submit your patch there.
+Best case scenario is you subscribe to the ml, submit your patch to
+bugzilla, and then post the url to the mailing list.
+
 If you're too lazy for either method, then I would rather
 you e-mailed your patches to me directly than not at all.
 
@@ -85,7 +88,7 @@
    >  #endif // UNICODE
       typedef const DIDEVICEINSTANCE  *LPCDIDEVICEINSTANCE;
 
-   ...and comment out/remove the duplicated code (go Microsoft!) marked by '>'.
+   ...and comment out/remove the duplicated code marked by '>'.
 
 4. If you didn't install the DirectX SDK in C:\DXSDK\, edit DXSDK_DIR in
    code/unix/Makefile to reflect the new location.