Fix double to float assignments by forcing fixed numbers to float.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@698 4a71c877-e1ca-e34f-864e-861f7616d084
Warzone2100 · Sep 8, 2006 · 78be6bc · 78be6bc
1 parent dcd97ac
commit 78be6bc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/lib/framework/SDL_framerate.c b/lib/framework/SDL_framerate.c
@@ -20,7 +20,7 @@ void SDL_initFramerate(FPSmanager * manager)
      */
     manager->framecount = 0;
     manager->rate = FPS_DEFAULT;
-    manager->rateticks = (1000.0 / (float) FPS_DEFAULT);
+    manager->rateticks = (1000.0f / (float) FPS_DEFAULT);
     manager->lastticks = SDL_GetTicks();
 }
 

diff --git a/lib/ivis_opengl/piedraw.c b/lib/ivis_opengl/piedraw.c
@@ -130,10 +130,10 @@ static BOOL shadows = FALSE;
 
 void pie_BeginLighting(float x, float y, float z) {
 	float pos[4];
-	float zero[4] = {0, 0, 0, 0};
-	float ambient[4] = {0.2, 0.2, 0.2, 0};
-	float diffuse[4] = {0.5, 0.5, 0.5, 0};
-	float specular[4] = {1, 1, 1, 0};
+	float zero[4] = {0.0f, 0.0f, 0.0f, 0.0f};
+	float ambient[4] = {0.2f, 0.2f, 0.2f, 0.0f};
+	float diffuse[4] = {0.5f, 0.5f, 0.5f, 0.0f};
+	float specular[4] = {1.0f, 1.0f, 1.0f, 0.0f};
 
 	pos[0] = x;
 	pos[1] = y;

diff --git a/lib/ivis_opengl/piestate.c b/lib/ivis_opengl/piestate.c
@@ -77,10 +77,10 @@ void pie_SetFogStatus(BOOL val)
 
 			if (rendStates.fog) {
 				fog.argb = pie_GetFogColour();
-				fog_colour[0] = fog.byte.r/255.0;
-				fog_colour[1] = fog.byte.g/255.0;
-				fog_colour[2] = fog.byte.b/255.0;
-				fog_colour[3] = fog.byte.a/255.0;
+				fog_colour[0] = fog.byte.r/255.0f;
+				fog_colour[1] = fog.byte.g/255.0f;
+				fog_colour[2] = fog.byte.b/255.0f;
+				fog_colour[3] = fog.byte.a/255.0f;
 
 				glFogi(GL_FOG_MODE, GL_LINEAR);
 				glFogfv(GL_FOG_COLOR, fog_colour);
@@ -132,7 +132,7 @@ void pie_SetColourKeyedBlack(BOOL keyingOn)
 
 		if (keyingOn == TRUE) {
 			glEnable(GL_ALPHA_TEST);
-			glAlphaFunc(GL_GREATER, 0.1);
+			glAlphaFunc(GL_GREATER, 0.1f);
 		} else {
 			glDisable(GL_ALPHA_TEST);
 		}

diff --git a/src/display3d.c b/src/display3d.c
@@ -754,7 +754,7 @@ void drawTiles(iView *camera, iView *player)
 	pie_MatRotY(player->r.y);
 	  /* Translate */
 	pie_TRANSLATE(-rx,-player->p.y,rz);
-	angle += 0.01;
+	angle += 0.01f;
 	// RODZ uncomment the following line to see an OpenGL lighting demo
 	if (getDrawShadows()) {
 		pie_BeginLighting(50, -300, -300);