From d4ea2e1fcaf3c4069f9787ad9107b26f31743bd9 Mon Sep 17 00:00:00 2001 From: havoc Date: Fri, 28 Jan 2011 23:56:56 +0000 Subject: [PATCH] fix some C++ warnings git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10774 d7cf8633-e32d-0410-b094-e92efae38249 --- dpsoftrast.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dpsoftrast.c b/dpsoftrast.c index 66748149..6005fcdf 100644 --- 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) { -- 2.39.2