fix some C++ warnings

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10774 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/dpsoftrast.c b/dpsoftrast.c
index 6674814999e1b159e08fa4dc80bd7d5f9ae0685d..6005fcdfc58010a40d0874130f3db53c297875ba 100644 (file)
--- a/dpsoftrast.c
+++ b/dpsoftrast.c
@@ -904,10 +904,10 @@ void DPSOFTRAST_Uniform4fvARB(DPSOFTRAST_UNIFORM index, const float *v)
        dpsoftrast.uniform4f[index*4+2] = v[2];
        dpsoftrast.uniform4f[index*4+3] = v[3];
 }
-void DPSOFTRAST_UniformMatrix4fvARB(DPSOFTRAST_UNIFORM index, int arraysize, int transpose, const float *v)
+void DPSOFTRAST_UniformMatrix4fvARB(DPSOFTRAST_UNIFORM uniform, int arraysize, int transpose, const float *v)
 {
-       int i;
-       for (i = 0;i < arraysize;i++, index += 4, v += 16)
+       int i, index;
+       for (i = 0, index = (int)uniform;i < arraysize;i++, index += 4, v += 16)
        {
                if (transpose)
                {