ubergames/ioef
0
0
Fork 0
mirror of https://github.com/UberGames/ioef.git synced 2025-01-18 23:21:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Remove some C99isms (f0rqu3)

Browse source 
* Provide Q_snprintf wrapper for snprintf (f0rqu3)
This commit is contained in:
Tim Angus 2007-10-01 07:56:32 +00:00
parent eb217f7364
commit 26641226a4
4 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/qcommon/qcommon.h
View file

@ -689,10 +689,12 @@ MISC
// vsnprintf is ISO/IEC 9899:1999 // vsnprintf is ISO/IEC 9899:1999
// abstracting this to make it portable // abstracting this to make it portable
#ifdef WIN32 #ifdef _WIN32
#define Q_vsnprintf _vsnprintf #define Q_vsnprintf _vsnprintf
#define Q_snprintf _snprintf
#else #else
#define Q_vsnprintf vsnprintf #define Q_vsnprintf vsnprintf
#define Q_snprintf snprintf
#endif #endif
// centralizing the declarations for cl_cdkey // centralizing the declarations for cl_cdkey

32
code/sdl/sdl_gamma.c
View file

@ -48,23 +48,25 @@ void GLimp_SetGamma( unsigned char red[256], unsigned char green[256], unsigned
#include <windows.h> #include <windows.h>
// Win2K and newer put this odd restriction on gamma ramps... // 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" ); OSVERSIONINFO vinfo;
for( j = 0 ; j < 3 ; j++ )
{
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 ) vinfo.dwOSVersionInfoSize = sizeof( vinfo );
table[ j ][ 127 ] = 254 << 8; GetVersionEx( &vinfo );
if( vinfo.dwMajorVersion >= 5 && vinfo.dwPlatformId == VER_PLATFORM_WIN32_NT )
{
Com_DPrintf( "performing gamma clamp.\n" );
for( j = 0 ; j < 3 ; j++ )
{
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;
}
} }
} }
#endif #endif

2
code/sdl/sdl_glimp.c
View file

@ -115,6 +115,7 @@ static int GLimp_SetMode( int mode, qboolean fullscreen )
int tcolorbits, tdepthbits, tstencilbits; int tcolorbits, tdepthbits, tstencilbits;
int i = 0; int i = 0;
SDL_Surface *vidscreen = NULL; SDL_Surface *vidscreen = NULL;
Uint32 flags = SDL_OPENGL;
ri.Printf( PRINT_ALL, "Initializing OpenGL display\n"); 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); ri.Printf( PRINT_ALL, " %d %d\n", glConfig.vidWidth, glConfig.vidHeight);
Uint32 flags = SDL_OPENGL;
if (fullscreen) if (fullscreen)
{ {
flags |= SDL_FULLSCREEN; flags |= SDL_FULLSCREEN;

2
code/sys/sys_main.c
View file

@ -463,7 +463,7 @@ void *Sys_LoadDll( const char *name, char *fqpath ,
assert( name ); assert( name );
getcwd(curpath, sizeof(curpath)); 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 // TODO: use fs_searchpaths from files.c
pwdpath = Sys_Cwd(); pwdpath = Sys_Cwd();