team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/client/pr_skelobj.c
View File

@ -2390,7 +2390,7 @@ void QCBUILTIN PF_skel_premul_bone (pubprogfuncs_t *prinst, struct globalvars_s
Vector4Copy(skelobj->bonematrix+12*boneidx+0, temp[0]);
Vector4Copy(skelobj->bonematrix+12*boneidx+4, temp[1]);
Vector4Copy(skelobj->bonematrix+12*boneidx+8, temp[2]);
R_ConcatTransforms(mult, temp, (float(*)[4])(skelobj->bonematrix+12*boneidx));
R_ConcatTransforms((void*)mult, (void*)temp, (float(*)[4])(skelobj->bonematrix+12*boneidx));
}
void QCBUILTIN PF_skel_postmul_bone (pubprogfuncs_t *prinst, struct globalvars_s *pr_globals)
{
@ -2412,7 +2412,7 @@ void QCBUILTIN PF_skel_postmul_bone (pubprogfuncs_t *prinst, struct globalvars_s
Vector4Copy(skelobj->bonematrix+12*boneidx+0, temp[0]);
Vector4Copy(skelobj->bonematrix+12*boneidx+4, temp[1]);
Vector4Copy(skelobj->bonematrix+12*boneidx+8, temp[2]);
R_ConcatTransforms(temp, mult, (float(*)[4])(skelobj->bonematrix+12*boneidx));
R_ConcatTransforms((void*)temp, (void*)mult, (float(*)[4])(skelobj->bonematrix+12*boneidx));
}
//void(float skel, float startbone, float endbone, vector org) skel_mul_bone (FTE_CSQC_SKELETONOBJECTS) (reads v_forward etc)
@ -2446,7 +2446,7 @@ void QCBUILTIN PF_skel_premul_bones (pubprogfuncs_t *prinst, struct globalvars_s
Vector4Copy(skelobj->bonematrix+12*startbone+0, temp[0]);
Vector4Copy(skelobj->bonematrix+12*startbone+4, temp[1]);
Vector4Copy(skelobj->bonematrix+12*startbone+8, temp[2]);
R_ConcatTransforms(mult, temp, (float(*)[4])(skelobj->bonematrix+12*startbone));
R_ConcatTransforms((void*)mult, (void*)temp, (float(*)[4])(skelobj->bonematrix+12*startbone));
startbone++;
}

2
engine/client/r_2d.c
View File

@ -1355,7 +1355,7 @@ void R2D_PolyBlend (void)
Vector2Set(tcoords[2], points[2][0]/64, points[2][1]/64);
Vector2Set(tcoords[3], points[3][0]/64, points[3][1]/64);
R2D_Image2dQuad((const vec2_t*)points, (const vec2_t*)tcoords, colours, shader_polyblend);
R2D_Image2dQuad((const vec2_t*)points, (const vec2_t*)tcoords, (const vec4_t*)colours, shader_polyblend);
}
}

8
engine/common/com_mesh.c
View File

@ -583,7 +583,7 @@ static const float *Alias_ConvertBoneData(skeltype_t sourcetype, const float *so
for (i = 0; i < bonecount; i++)
{
if (bones[i].parent >= 0)
R_ConcatTransforms((void*)(dest + bones[i].parent*12), (const void*)(sourcedata+i*12), (void*)(dest+i*12));
R_ConcatTransforms((void*)(dest + bones[i].parent*12), (void*)(sourcedata+i*12), (void*)(dest+i*12));
else
{
Vector4Copy(sourcedata+i*12+0, dest+i*12+0);
@ -607,7 +607,7 @@ static const float *Alias_ConvertBoneData(skeltype_t sourcetype, const float *so
for (i = 0; i < bonecount; i++)
{
Matrix3x4_Invert_Simple(bones[i].inverse, iim);
R_ConcatTransforms((const void*)(sourcedata + i*12), (const void*)iim, (void*)(dest + i*12));
R_ConcatTransforms((void*)(sourcedata + i*12), (void*)iim, (void*)(dest + i*12));
}
sourcedata = dest;
sourcetype = SKEL_ABSOLUTE;
@ -625,7 +625,7 @@ static const float *Alias_ConvertBoneData(skeltype_t sourcetype, const float *so
if (bones[i].parent >= 0)
{
Matrix3x4_Invert_Simple(sourcedata+bones[i].parent*12, ip);
R_ConcatTransforms((void*)ip, (const void*)(sourcedata+i*12), (void*)(dest+i*12));
R_ConcatTransforms((void*)ip, (void*)(sourcedata+i*12), (void*)(dest+i*12));
}
else
{
@ -646,7 +646,7 @@ static const float *Alias_ConvertBoneData(skeltype_t sourcetype, const float *so
{
float *dest = (sourcedata == destbuffer)?destbufferalt:destbuffer;
for (i = 0; i < bonecount; i++)
R_ConcatTransforms((const void*)(sourcedata + i*12), (void*)(bones[i].inverse), (void*)(dest + i*12));
R_ConcatTransforms((void*)(sourcedata + i*12), (void*)(bones[i].inverse), (void*)(dest + i*12));
sourcedata = dest;
sourcetype = SKEL_INVERSE_ABSOLUTE;
}

2
engine/common/pmove.c
View File

@ -161,7 +161,7 @@ static trace_t PM_PlayerTracePortals(vec3_t start, vec3_t end, unsigned int soli
{
vec3_t move;
vec3_t from;
vec3_t newang, newvel;
vec3_t newang, newvel = {0,0,0};
VectorCopy(trace.endpos, from); //just in case
VectorSubtract(end, trace.endpos, move);

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
}