engine: fix -Wmaybe-uninitialized

This commit is contained in:
Alibek Omarov
2019-12-24 02:47:51 +03:00
parent d0dbd185ad
commit 0fe18ae6dc
11 changed files with 38 additions and 30 deletions
+4
View File
@@ -217,6 +217,10 @@ qboolean Image_LoadPNG( const char *name, const byte *buffer, fs_offset_t filesi
case PNG_CT_RGBA:
pixel_size = 4;
break;
default:
pixel_size = 0; // make compiler happy
ASSERT( false );
break;
}
image.type = PF_RGBA_32; // always exctracted to 32-bit buffer
+1 -1
View File
@@ -1975,7 +1975,7 @@ static void Mod_LoadTextures( dbspmodel_t *bmod )
if( mt->offsets[0] > 0 )
{
int size = (int)sizeof( mip_t ) + ((mt->width * mt->height * 85)>>6);
int next_dataofs, remaining;
int next_dataofs = 0, remaining;
// compute next dataofset to determine allocated miptex space
for( j = i + 1; j < loadmodel->numtextures; j++ )
+1 -2
View File
@@ -80,7 +80,7 @@ void Mod_LoadSpriteModel( model_t *mod, const void *buffer, qboolean *loaded, ui
mod->mins[2] = -pinq1->bounds[1] * 0.5f;
mod->maxs[2] = pinq1->bounds[1] * 0.5f;
}
else if( i == SPRITE_VERSION_HL )
else // if( i == SPRITE_VERSION_HL )
{
pinhl = (dsprite_hl_t *)buffer;
size = sizeof( msprite_t ) + ( pinhl->numframes - 1 ) * sizeof( psprite->frames );
@@ -104,7 +104,6 @@ void Mod_LoadSpriteModel( model_t *mod, const void *buffer, qboolean *loaded, ui
if( Host_IsDedicated() )
{
// skip frames loading
psprite->numframes = 0;
return;
}
+12 -12
View File
@@ -320,19 +320,19 @@ static void Mod_StudioCalcBoneAdj( float *adj, const byte *pcontroller )
if( i == STUDIO_MOUTH )
continue; // ignore mouth
if( i <= MAXSTUDIOCONTROLLERS )
if( i >= MAXSTUDIOCONTROLLERS )
continue;
// check for 360% wrapping
if( pbonecontroller[j].type & STUDIO_RLOOP )
{
// check for 360% wrapping
if( pbonecontroller[j].type & STUDIO_RLOOP )
{
value = pcontroller[i] * (360.0f / 256.0f) + pbonecontroller[j].start;
}
else
{
value = pcontroller[i] / 255.0f;
value = bound( 0.0f, value, 1.0f );
value = (1.0f - value) * pbonecontroller[j].start + value * pbonecontroller[j].end;
}
value = pcontroller[i] * (360.0f / 256.0f) + pbonecontroller[j].start;
}
else
{
value = pcontroller[i] / 255.0f;
value = bound( 0.0f, value, 1.0f );
value = (1.0f - value) * pbonecontroller[j].start + value * pbonecontroller[j].end;
}
switch( pbonecontroller[j].type & STUDIO_TYPES )
+1 -1
View File
@@ -68,7 +68,7 @@ void Sys_Print( const char *pMsg );
void Sys_PrintLog( const char *pMsg );
void Sys_InitLog( void );
void Sys_CloseLog( void );
void Sys_Quit( void );
void Sys_Quit( void ) NORETURN;
//
// sys_con.c