diff options
| -rw-r--r-- | code/qcommon/qcommon.h | 4 | ||||
| -rw-r--r-- | code/sdl/sdl_gamma.c | 28 | ||||
| -rw-r--r-- | code/sdl/sdl_glimp.c | 2 | ||||
| -rw-r--r-- | code/sys/sys_main.c | 2 |
4 files changed, 20 insertions, 16 deletions
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h index 5fd3cd5..7d977ac 100644 --- a/code/qcommon/qcommon.h +++ b/code/qcommon/qcommon.h @@ -689,10 +689,12 @@ MISC // vsnprintf is ISO/IEC 9899:1999 // abstracting this to make it portable -#ifdef WIN32 +#ifdef _WIN32 #define Q_vsnprintf _vsnprintf +#define Q_snprintf _snprintf #else #define Q_vsnprintf vsnprintf +#define Q_snprintf snprintf #endif // centralizing the declarations for cl_cdkey diff --git a/code/sdl/sdl_gamma.c b/code/sdl/sdl_gamma.c index 69143cb..2673700 100644 --- a/code/sdl/sdl_gamma.c +++ b/code/sdl/sdl_gamma.c @@ -48,23 +48,25 @@ void GLimp_SetGamma( unsigned char red[256], unsigned char green[256], unsigned #include <windows.h> // Win2K and newer put this odd restriction on gamma ramps... - OSVERSIONINFO vinfo; - - vinfo.dwOSVersionInfoSize = sizeof( vinfo ); - GetVersionEx( &vinfo ); - if( vinfo.dwMajorVersion >= 5 && vinfo.dwPlatformId == VER_PLATFORM_WIN32_NT ) { - Com_DPrintf( "performing gamma clamp.\n" ); - for( j = 0 ; j < 3 ; j++ ) + OSVERSIONINFO vinfo; + + vinfo.dwOSVersionInfoSize = sizeof( vinfo ); + GetVersionEx( &vinfo ); + if( vinfo.dwMajorVersion >= 5 && vinfo.dwPlatformId == VER_PLATFORM_WIN32_NT ) { - for( i = 0 ; i < 128 ; i++ ) + Com_DPrintf( "performing gamma clamp.\n" ); + for( j = 0 ; j < 3 ; j++ ) { - if( table[ j ] [ i] > ( ( 128 + i ) << 8 ) ) - table[ j ][ i ] = ( 128 + i ) << 8; - } + for( i = 0 ; i < 128 ; i++ ) + { + if( table[ j ] [ i] > ( ( 128 + i ) << 8 ) ) + table[ j ][ i ] = ( 128 + i ) << 8; + } - if( table[ j ] [127 ] > 254 << 8 ) - table[ j ][ 127 ] = 254 << 8; + if( table[ j ] [127 ] > 254 << 8 ) + table[ j ][ 127 ] = 254 << 8; + } } } #endif diff --git a/code/sdl/sdl_glimp.c b/code/sdl/sdl_glimp.c index c2a187a..5befe19 100644 --- a/code/sdl/sdl_glimp.c +++ b/code/sdl/sdl_glimp.c @@ -115,6 +115,7 @@ static int GLimp_SetMode( int mode, qboolean fullscreen ) int tcolorbits, tdepthbits, tstencilbits; int i = 0; SDL_Surface *vidscreen = NULL; + Uint32 flags = SDL_OPENGL; ri.Printf( PRINT_ALL, "Initializing OpenGL display\n"); @@ -127,7 +128,6 @@ static int GLimp_SetMode( int mode, qboolean fullscreen ) } ri.Printf( PRINT_ALL, " %d %d\n", glConfig.vidWidth, glConfig.vidHeight); - Uint32 flags = SDL_OPENGL; if (fullscreen) { flags |= SDL_FULLSCREEN; diff --git a/code/sys/sys_main.c b/code/sys/sys_main.c index eb85b7f..f12f83b 100644 --- a/code/sys/sys_main.c +++ b/code/sys/sys_main.c @@ -463,7 +463,7 @@ void *Sys_LoadDll( const char *name, char *fqpath , assert( name ); getcwd(curpath, sizeof(curpath)); - snprintf (fname, sizeof(fname), "%s" ARCH_STRING DLL_EXT, name); + Q_snprintf (fname, sizeof(fname), "%s" ARCH_STRING DLL_EXT, name); // TODO: use fs_searchpaths from files.c pwdpath = Sys_Cwd(); |