mirror of
https://git.code.sf.net/p/quake/quake2forge
synced 2025-03-03 23:40:55 +00:00
clean up a bunch of type punning warnings
This commit is contained in:
parent
4fec79655b
commit
31e9e7e883
13 changed files with 22 additions and 22 deletions
|
@ -261,9 +261,9 @@ float Q_fabs (float f)
|
|||
return f;
|
||||
return -f;
|
||||
#else
|
||||
int tmp = * ( int * ) &f;
|
||||
int tmp = * ( int * ) (char *) &f;
|
||||
tmp &= 0x7FFFFFFF;
|
||||
return * ( float * ) &tmp;
|
||||
return * ( float * ) (char *) &tmp;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
@ -75,7 +75,7 @@ void SCR_LoadPCX (char *filename, byte **pic, byte **palette, int *width, int *h
|
|||
//
|
||||
// load the file
|
||||
//
|
||||
len = FS_LoadFile (filename, (void **)&raw);
|
||||
len = FS_LoadFile (filename, (void **) (char *) &raw);
|
||||
if (!raw)
|
||||
return; // Com_Printf ("Bad pcx file %s\n", filename);
|
||||
|
||||
|
|
|
@ -1165,7 +1165,7 @@ void CL_RequestNextDownload (void)
|
|||
// checking for skins in the model
|
||||
if (!precache_model) {
|
||||
|
||||
FS_LoadFile (cl.configstrings[precache_check], (void **)&precache_model);
|
||||
FS_LoadFile (cl.configstrings[precache_check], (void **) (char *) &precache_model);
|
||||
if (!precache_model) {
|
||||
precache_model_skin = 0;
|
||||
precache_check++;
|
||||
|
|
|
@ -379,7 +379,7 @@ void Cmd_Exec_f (void)
|
|||
return;
|
||||
}
|
||||
|
||||
len = FS_LoadFile (Cmd_Argv(1), (void **)&f);
|
||||
len = FS_LoadFile (Cmd_Argv(1), (void **) (char *) &f);
|
||||
if (!f)
|
||||
{
|
||||
Com_Printf ("couldn't exec %s\n",Cmd_Argv(1));
|
||||
|
|
|
@ -588,7 +588,7 @@ cmodel_t *CM_LoadMap (char *name, qboolean clientload, unsigned *checksum)
|
|||
//
|
||||
// load the file
|
||||
//
|
||||
length = FS_LoadFile (name, (void **)&buf);
|
||||
length = FS_LoadFile (name, (void **) (char *) &buf);
|
||||
if (!buf)
|
||||
Com_Error (ERR_DROP, "Couldn't load %s", name);
|
||||
|
||||
|
|
|
@ -255,9 +255,9 @@ float Q_fabs (float f)
|
|||
return f;
|
||||
return -f;
|
||||
#else
|
||||
int tmp = * ( int * ) &f;
|
||||
int tmp = * ( int * ) (char *) &f;
|
||||
tmp &= 0x7FFFFFFF;
|
||||
return * ( float * ) &tmp;
|
||||
return * ( float * ) (char *) &tmp;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
@ -445,7 +445,7 @@ void LoadPCX (char *filename, byte **pic, byte **palette, int *width, int *heigh
|
|||
//
|
||||
// load the file
|
||||
//
|
||||
len = ri.FS_LoadFile (filename, (void **)&raw);
|
||||
len = ri.FS_LoadFile (filename, (void **) (char *) &raw);
|
||||
if (!raw)
|
||||
{
|
||||
ri.Con_Printf (PRINT_DEVELOPER, "Bad pcx file %s\n", filename);
|
||||
|
@ -565,7 +565,7 @@ void LoadTGA (char *name, byte **pic, int *width, int *height)
|
|||
//
|
||||
// load the file
|
||||
//
|
||||
length = ri.FS_LoadFile (name, (void **)&buffer);
|
||||
length = ri.FS_LoadFile (name, (void **) (char *) &buffer);
|
||||
if (!buffer)
|
||||
{
|
||||
ri.Con_Printf (PRINT_DEVELOPER, "Bad tga file %s\n", name);
|
||||
|
@ -1336,7 +1336,7 @@ image_t *GL_LoadWal (char *name)
|
|||
int width, height, ofs;
|
||||
image_t *image;
|
||||
|
||||
ri.FS_LoadFile (name, (void **)&mt);
|
||||
ri.FS_LoadFile (name, (void **) (char *) &mt);
|
||||
if (!mt)
|
||||
{
|
||||
ri.Con_Printf (PRINT_ALL, "GL_FindImage: can't load %s\n", name);
|
||||
|
@ -1366,7 +1366,7 @@ image_t *GL_LoadWal32 (char *name)
|
|||
int width, height, ofs;
|
||||
image_t *image;
|
||||
|
||||
ri.FS_LoadFile (name, (void **)&mt);
|
||||
ri.FS_LoadFile (name, (void **) (char *) &mt);
|
||||
if (!mt)
|
||||
{
|
||||
ri.Con_Printf (PRINT_ALL, "GL_FindImage: Can't Load %s\n", name);
|
||||
|
|
|
@ -226,7 +226,7 @@ model_t *Mod_ForName (char *name, qboolean crash)
|
|||
//
|
||||
// load the file
|
||||
//
|
||||
modfilelen = ri.FS_LoadFile (mod->name, (void **)&buf);
|
||||
modfilelen = ri.FS_LoadFile (mod->name, (void **) (char *) &buf);
|
||||
if (!buf)
|
||||
{
|
||||
if (crash)
|
||||
|
|
|
@ -1863,7 +1863,7 @@ void M_Menu_Credits_f( void )
|
|||
int isdeveloper = 0;
|
||||
|
||||
creditsBuffer = NULL;
|
||||
count = FS_LoadFile ("credits", (void **)&creditsBuffer);
|
||||
count = FS_LoadFile ("credits", (void **) (char *) &creditsBuffer);
|
||||
if (count != -1)
|
||||
{
|
||||
p = creditsBuffer;
|
||||
|
@ -2572,7 +2572,7 @@ void StartServer_MenuInit( void )
|
|||
Com_sprintf( mapsname, sizeof( mapsname ), "%s/maps.lst", FS_Gamedir() );
|
||||
if ( ( fp = fopen( mapsname, "rb" ) ) == 0 )
|
||||
{
|
||||
if ( ( length = FS_LoadFile( "maps.lst", ( void ** ) &buffer ) ) == -1 )
|
||||
if ( ( length = FS_LoadFile( "maps.lst", (void **) (char *) &buffer ) ) == -1 )
|
||||
Com_Error( ERR_DROP, "couldn't find maps.lst\n" );
|
||||
}
|
||||
else
|
||||
|
|
|
@ -261,9 +261,9 @@ float Q_fabs (float f)
|
|||
return f;
|
||||
return -f;
|
||||
#else
|
||||
int tmp = * ( int * ) &f;
|
||||
int tmp = * ( int * ) (char *) &f;
|
||||
tmp &= 0x7FFFFFFF;
|
||||
return * ( float * ) &tmp;
|
||||
return * ( float * ) (char *) &tmp;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
@ -100,7 +100,7 @@ void LoadPCX (char *filename, byte **pic, byte **palette, int *width, int *heigh
|
|||
//
|
||||
// load the file
|
||||
//
|
||||
len = ri.FS_LoadFile (filename, (void **)&raw);
|
||||
len = ri.FS_LoadFile (filename, (void **) (char *) &raw);
|
||||
if (!raw)
|
||||
{
|
||||
ri.Con_Printf (PRINT_DEVELOPER, "Bad pcx file %s\n", filename);
|
||||
|
@ -219,7 +219,7 @@ void LoadTGA (char *name, byte **pic, int *width, int *height)
|
|||
//
|
||||
// load the file
|
||||
//
|
||||
length = ri.FS_LoadFile (name, (void **)&buffer);
|
||||
length = ri.FS_LoadFile (name, (void **) (char *) &buffer);
|
||||
if (!buffer)
|
||||
{
|
||||
ri.Con_Printf (PRINT_DEVELOPER, "Bad tga file %s\n", name);
|
||||
|
@ -456,7 +456,7 @@ image_t *R_LoadWal (char *name)
|
|||
image_t *image;
|
||||
int size;
|
||||
|
||||
ri.FS_LoadFile (name, (void **)&mt);
|
||||
ri.FS_LoadFile (name, (void **) (char *) &mt);
|
||||
if (!mt)
|
||||
{
|
||||
ri.Con_Printf (PRINT_ALL, "R_LoadWal: can't load %s\n", name);
|
||||
|
|
|
@ -135,7 +135,7 @@ model_t *Mod_ForName (char *name, qboolean crash)
|
|||
//
|
||||
// load the file
|
||||
//
|
||||
modfilelen = ri.FS_LoadFile (mod->name, (void **)&buf);
|
||||
modfilelen = ri.FS_LoadFile (mod->name, (void **) (char *) &buf);
|
||||
if (!buf)
|
||||
{
|
||||
if (crash)
|
||||
|
|
|
@ -149,7 +149,7 @@ sfxcache_t *S_LoadSound (sfx_t *s)
|
|||
|
||||
// Com_Printf ("loading %s\n",namebuffer);
|
||||
|
||||
size = FS_LoadFile (namebuffer, (void **)&data);
|
||||
size = FS_LoadFile (namebuffer, (void **) (char *) &data);
|
||||
|
||||
if (!data)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue