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

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);
}
}