Removed a few warnings in MSVC6
authormolivier <molivier@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 4 Mar 2004 13:14:53 +0000 (13:14 +0000)
committermolivier <molivier@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 4 Mar 2004 13:14:53 +0000 (13:14 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3966 d7cf8633-e32d-0410-b094-e92efae38249

curves.c
gl_backend.c

index 8378a4b..a94dc71 100644 (file)
--- a/curves.c
+++ b/curves.c
@@ -340,7 +340,7 @@ float QuadraticSplinePatchLargestDeviationOnX(int cpwidth, int cpheight, int com
                                bestsquareddeviation = squareddeviation;
                }
        }
-       return sqrt(bestsquareddeviation);
+       return (float)sqrt(bestsquareddeviation);
 }
 
 float QuadraticSplinePatchLargestDeviationOnY(int cpwidth, int cpheight, int components, const float *in)
@@ -363,7 +363,7 @@ float QuadraticSplinePatchLargestDeviationOnY(int cpwidth, int cpheight, int com
                                bestsquareddeviation = squareddeviation;
                }
        }
-       return sqrt(bestsquareddeviation);
+       return (float)sqrt(bestsquareddeviation);
 }
 
 int QuadraticSplinePatchSubdivisionLevelForDeviation(float deviation, float level1tolerance, int levellimit)
index c4d6228..5531944 100644 (file)
@@ -556,7 +556,7 @@ void GL_ColorMask(int r, int g, int b, int a)
                if (r_showtrispass)
                        return;
                gl_state.colormask = state;
-               qglColorMask(r, g, b, a);CHECKGLERROR
+               qglColorMask((GLboolean)r, (GLboolean)g, (GLboolean)b, (GLboolean)a);CHECKGLERROR
        }
 }