fte/fteqw
2
0
Fork 1
Code Issues Pull requests Releases 1 Activity Actions

Fixed some warnings that get triggered on OpenBSD's version of GCC 4

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5427 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Eukara 2019-03-04 19:24:51 +00:00
parent bff1b66fac
commit af7c4f214b
6 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engine/gl/gl_hlmdl.c
View file

@ -1020,7 +1020,7 @@ qboolean HLMDL_Trace (model_t *model, int hulloverride, framestate_t *framestat
{
/* If we have a parent, take the addition. Otherwise just copy the values */
if(hm->bones[b].parent>=0)
R_ConcatTransforms(transform_matrix[hm->bones[b].parent], (void*)(relbones+b*12), transform_matrix[b]);
R_ConcatTransforms((void*)transform_matrix[hm->bones[b].parent], (void*)(relbones+b*12), transform_matrix[b]);
else if (axis)
R_ConcatTransformsAxis(axis, (void*)(relbones+b*12), transform_matrix[b]);
else
@ -1174,7 +1174,7 @@ void R_HL_BuildFrame(hlmodel_t *model, hlmdl_submodel_t *amodel, entity_t *curen
/* If we have a parent, take the addition. Otherwise just copy the values */
if(model->bones[b].parent>=0)
{
R_ConcatTransforms(transform_matrix[model->bones[b].parent], (void*)(curent->framestate.bonestate+b*12), transform_matrix[b]);
R_ConcatTransforms((void*)transform_matrix[model->bones[b].parent], (void*)(curent->framestate.bonestate+b*12), transform_matrix[b]);
}
else
{
@ -1217,7 +1217,7 @@ void R_HL_BuildFrame(hlmodel_t *model, hlmdl_submodel_t *amodel, entity_t *curen
/* If we have a parent, take the addition. Otherwise just copy the values */
if(model->bones[b].parent>=0)
{
R_ConcatTransforms(transform_matrix[model->bones[b].parent], (void*)(relatives+b*12), transform_matrix[b]);
R_ConcatTransforms((void*)transform_matrix[model->bones[b].parent], (void*)(relatives+b*12), transform_matrix[b]);
}
else
{
@ -1447,9 +1447,9 @@ void HLMDL_DrawHitBoxes(entity_t *rent)
{
//If we have a parent, take the addition. Otherwise just copy the values
if(model->bones[b].parent>=0)
R_ConcatTransforms(transform_matrix[model->bones[b].parent], (void*)(relbones+b*12), transform_matrix[b]);
R_ConcatTransforms((void*)transform_matrix[model->bones[b].parent], (void*)(relbones+b*12), transform_matrix[b]);
else
R_ConcatTransforms(entitymatrix, (void*)(relbones+b*12), transform_matrix[b]);
R_ConcatTransforms((void*)entitymatrix, (void*)(relbones+b*12), transform_matrix[b]);
}
for (b = 0; b < model->header->num_hitboxes; b++, hitbox++)

4
engine/gl/gl_ngraph.c
View file

@ -198,7 +198,7 @@ void R_NetGraph (void)
Vector4Copy(rgba[2+0], rgba[2+1]);
if (a)
R2D_Image2dQuad(p, tc, rgba, shader_draw_fill);
R2D_Image2dQuad((const vec2_t*)p, (const vec2_t*)tc, (const vec4_t*)rgba, shader_draw_fill);
}
#endif
}
@ -248,7 +248,7 @@ void R_FrameTimeGraph (float frametime)
Vector4Copy(rgba[2+0], rgba[2+1]);
if (a)
R2D_Image2dQuad(p, tc, rgba, shader_draw_fill);
R2D_Image2dQuad((const vec2_t*)p, (const vec2_t*)tc, (const vec4_t*)rgba, shader_draw_fill);
}
#endif
}