diff options
| -rw-r--r-- | code/qcommon/vm_x86.c | 12 | ||||
| -rw-r--r-- | code/renderer/tr_model.c | 4 | ||||
| -rw-r--r-- | code/win32/win_main.c | 4 | ||||
| -rw-r--r-- | i_o-q3-readme | 5 |
4 files changed, 14 insertions, 11 deletions
diff --git a/code/qcommon/vm_x86.c b/code/qcommon/vm_x86.c index dbc1f37..a1e3317 100644 --- a/code/qcommon/vm_x86.c +++ b/code/qcommon/vm_x86.c @@ -60,10 +60,10 @@ int _ftol( float ); 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 @@ int qftol0F7F( void ); 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 callAsmCall(void) } 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" \ diff --git a/code/renderer/tr_model.c b/code/renderer/tr_model.c index 80b8094..d7aad51 100644 --- a/code/renderer/tr_model.c +++ b/code/renderer/tr_model.c @@ -180,9 +180,9 @@ qhandle_t RE_RegisterModel( const char *name ) { 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 ) { diff --git a/code/win32/win_main.c b/code/win32/win_main.c index a66f712..6980bd4 100644 --- a/code/win32/win_main.c +++ b/code/win32/win_main.c @@ -606,8 +606,8 @@ void * QDECL Sys_LoadDll( const char *name, char *fqpath , long (QDECL **entryPo } #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; diff --git a/i_o-q3-readme b/i_o-q3-readme index fb38c35..e9638b2 100644 --- a/i_o-q3-readme +++ b/i_o-q3-readme @@ -4,6 +4,9 @@ Hello and welcome to the Quake 3 source repository on icculus.org I'll be your maintainer, zakk@icculus.org, please send all your patches to the bugzilla: https://bugzilla.icculus.org, or join the mailing list (quake3-subscribe@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 @@ follows: > #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. |