fix a bunch of pointer type warnings introduced by the change to const parameters...

[xonotic/darkplaces.git] / gl_models.c

diff --git a/gl_models.c b/gl_models.c
index 6f435a0e14605a368273dc7bc87c2892fda6cd35..f8ca7646f89ae297938e2e31b88d35ab809ecd26 100644 (file)
--- a/gl_models.c
+++ b/gl_models.c
@@ -568,7 +568,7 @@ int ZymoticLerpBones(int count, zymbonematrix *bonebase, frameblend_t *blend, zy
        m.m[2][1] = 0;
        m.m[2][2] = 1;
        m.m[2][3] = 0;
-       R_ConcatTransforms(&softwaretransform_matrix[0], &m.m[0], &rootmatrix.m[0]);
+       R_ConcatTransforms(&softwaretransform_matrix[0], &m.m[0][0], &rootmatrix.m[0][0]);
        */
 
        // LordHavoc: combine transform from zym coordinate space to quake coordinate space with model to world transform matrix
@@ -616,9 +616,9 @@ int ZymoticLerpBones(int count, zymbonematrix *bonebase, frameblend_t *blend, zy
                                        m.m[2][2] = bone1->m[2][2] * lerp1 + bone2->m[2][2] * lerp2 + bone3->m[2][2] * lerp3 + bone4->m[2][2] * lerp4;
                                        m.m[2][3] = bone1->m[2][3] * lerp1 + bone2->m[2][3] * lerp2 + bone3->m[2][3] * lerp3 + bone4->m[2][3] * lerp4;
                                        if (bone->parent >= 0)
-                                               R_ConcatTransforms(&zymbonepose[bone->parent].m[0], &m.m[0], &out->m[0]);
+                                               R_ConcatTransforms(&zymbonepose[bone->parent].m[0][0], &m.m[0][0], &out->m[0][0]);
                                        else
-                                               R_ConcatTransforms(&rootmatrix.m[0], &m.m[0], &out->m[0]);
+                                               R_ConcatTransforms(&rootmatrix.m[0][0], &m.m[0][0], &out->m[0][0]);
                                        bone1++;
                                        bone2++;
                                        bone3++;
@@ -645,9 +645,9 @@ int ZymoticLerpBones(int count, zymbonematrix *bonebase, frameblend_t *blend, zy
                                        m.m[2][2] = bone1->m[2][2] * lerp1 + bone2->m[2][2] * lerp2 + bone3->m[2][2] * lerp3;
                                        m.m[2][3] = bone1->m[2][3] * lerp1 + bone2->m[2][3] * lerp2 + bone3->m[2][3] * lerp3;
                                        if (bone->parent >= 0)
-                                               R_ConcatTransforms(&zymbonepose[bone->parent].m[0], &m.m[0], &out->m[0]);
+                                               R_ConcatTransforms(&zymbonepose[bone->parent].m[0][0], &m.m[0][0], &out->m[0][0]);
                                        else
-                                               R_ConcatTransforms(&rootmatrix.m[0], &m.m[0], &out->m[0]);
+                                               R_ConcatTransforms(&rootmatrix.m[0][0], &m.m[0][0], &out->m[0][0]);
                                        bone1++;
                                        bone2++;
                                        bone3++;
@@ -674,9 +674,9 @@ int ZymoticLerpBones(int count, zymbonematrix *bonebase, frameblend_t *blend, zy
                                m.m[2][2] = bone1->m[2][2] * lerp1 + bone2->m[2][2] * lerp2;
                                m.m[2][3] = bone1->m[2][3] * lerp1 + bone2->m[2][3] * lerp2;
                                if (bone->parent >= 0)
-                                       R_ConcatTransforms(&zymbonepose[bone->parent].m[0], &m.m[0], &out->m[0]);
+                                       R_ConcatTransforms(&zymbonepose[bone->parent].m[0][0], &m.m[0][0], &out->m[0][0]);
                                else
-                                       R_ConcatTransforms(&rootmatrix.m[0], &m.m[0], &out->m[0]);
+                                       R_ConcatTransforms(&rootmatrix.m[0][0], &m.m[0][0], &out->m[0][0]);
                                bone1++;
                                bone2++;
                                bone++;
@@ -705,9 +705,9 @@ int ZymoticLerpBones(int count, zymbonematrix *bonebase, frameblend_t *blend, zy
                                m.m[2][2] = bone1->m[2][2] * lerp1;
                                m.m[2][3] = bone1->m[2][3] * lerp1;
                                if (bone->parent >= 0)
-                                       R_ConcatTransforms(&zymbonepose[bone->parent].m[0], &m.m[0], &out->m[0]);
+                                       R_ConcatTransforms(&zymbonepose[bone->parent].m[0][0], &m.m[0][0], &out->m[0][0]);
                                else
-                                       R_ConcatTransforms(&rootmatrix.m[0], &m.m[0], &out->m[0]);
+                                       R_ConcatTransforms(&rootmatrix.m[0][0], &m.m[0][0], &out->m[0][0]);
                                bone1++;
                                bone++;
                        }
@@ -718,9 +718,9 @@ int ZymoticLerpBones(int count, zymbonematrix *bonebase, frameblend_t *blend, zy
                        for (i = 0, out = zymbonepose;i < count;i++, out++)
                        {
                                if (bone->parent >= 0)
-                                       R_ConcatTransforms(&zymbonepose[bone->parent].m[0], &bone1->m[0], &out->m[0]);
+                                       R_ConcatTransforms(&zymbonepose[bone->parent].m[0][0], &bone1->m[0][0], &out->m[0][0]);
                                else
-                                       R_ConcatTransforms(&rootmatrix.m[0], &bone1->m[0], &out->m[0]);
+                                       R_ConcatTransforms(&rootmatrix.m[0][0], &bone1->m[0][0], &out->m[0][0]);
                                bone1++;
                                bone++;
                        }