[Scummvm-cvs-logs] CVS: scummvm/backends/sdl fb2opengl.h,1.16,1.17

Pawel Kolodziejski aquadran at users.sourceforge.net
Sun Jun 22 08:01:03 CEST 2003


Update of /cvsroot/scummvm/scummvm/backends/sdl
In directory sc8-pr-cvs1:/tmp/cvs-serv13524

Modified Files:
	fb2opengl.h 
Log Message:
fixed warnings

Index: fb2opengl.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/fb2opengl.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- fb2opengl.h	22 Jun 2003 14:39:55 -0000	1.16
+++ fb2opengl.h	22 Jun 2003 15:00:51 -0000	1.17
@@ -151,14 +151,14 @@
 
 
 void FB2GL::makeDisplayList(int xf, int yf) {
-	float xfix = xf / 128.0; // 128 = 256/2 (half texture => 0.0 to 1.0)
-	float yfix = yf / 128.0;
+	float xfix = xf / 128.0f; // 128 = 256/2 (half texture => 0.0 to 1.0)
+	float yfix = yf / 128.0f;
 	float texend;	// End of 256x256 (from -1.0 to 1.0)
 
 	if (flags & FB2GL_NO_320)
-		texend = 96.0 / 160.0; // 160=320/2 (== 0.0), 256-160=96.
+		texend = 96.0f / 160.0f; // 160=320/2 (== 0.0), 256-160=96.
 	else
-		texend = 1.0;
+		texend = 1.0f;
 	
 	if (glIsList(displayList)) 
 		glDeleteLists(displayList, 1);
@@ -172,13 +172,13 @@
 
 	glBegin(GL_QUADS);
 	// upper left
-	glTexCoord2f(0.0, 1.0); glVertex2f(-1.0, -1.0 - yfix);
+	glTexCoord2f(0.0f, 1.0f); glVertex2f(-1.0f, -1.0f - yfix);
 	// lower left
-	glTexCoord2f(0.0, 0.0); glVertex2f(-1.0, 1.0);
+	glTexCoord2f(0.0f, 0.0f); glVertex2f(-1.0f, 1.0f);
 	// lower right
-	glTexCoord2f(1.0, 0.0); glVertex2f(texend + xfix, 1.0);
+	glTexCoord2f(1.0f, 0.0f); glVertex2f(texend + xfix, 1.0f);
 	// upper right
-	glTexCoord2f(1.0, 1.0); glVertex2f(texend + xfix, -1.0 - yfix);
+	glTexCoord2f(1.0f, 1.0f); glVertex2f(texend + xfix, -1.0f - yfix);
 	glEnd();
 
 	if (flags & FB2GL_NO_320) {
@@ -187,13 +187,13 @@
 
 		glBegin(GL_QUADS);
 		// upper left
-		glTexCoord2f(0.0, 1.0); glVertex2f(texend + xfix, -1.0 - yfix);
+		glTexCoord2f(0.0f, 1.0f); glVertex2f(texend + xfix, -1.0f - yfix);
 		// lower left	
-		glTexCoord2f(0.0, 0.0); glVertex2f(texend + xfix, 1.0);
+		glTexCoord2f(0.0f, 0.0f); glVertex2f(texend + xfix, 1.0f);
 		// lower right
-		glTexCoord2f(1.0, 0.0); glVertex2f(1.0 + xfix, 1.0);
+		glTexCoord2f(1.0f, 0.0f); glVertex2f(1.0f + xfix, 1.0f);
 		// upper right
-		glTexCoord2f(1.0, 1.0); glVertex2f(1.0 + xfix, -1.0 - yfix);
+		glTexCoord2f(1.0f, 1.0f); glVertex2f(1.0f + xfix, -1.0f - yfix);
 		glEnd();
 	}
 





More information about the Scummvm-git-logs mailing list