From: molivier <molivier@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 4 Mar 2004 13:14:53 +0000 (+0000)
Subject: Removed a few warnings in MSVC6
X-Git-Tag: xonotic-v0.1.0preview~6037
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9c9fbd2ccd31171524e4234f6768ca88cf32c687;p=xonotic%2Fdarkplaces.git

Removed a few warnings in MSVC6


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

diff --git a/curves.c b/curves.c
index 8378a4ba..a94dc71c 100644
--- 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)
diff --git a/gl_backend.c b/gl_backend.c
index c4d62284..5531944c 100644
--- a/gl_backend.c
+++ b/gl_backend.c
@@ -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
 	}
 }