From 3c57f16a4a3ee128c6d2bd17008c9a5db8287979 Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Wed, 27 Oct 2010 17:06:40 +0000
Subject: [PATCH] - cleanup some compiler warnings in vc++ and removed
 commented out debug info for in progress texture compression

---
 source/glest_game/game/game_constants.h        | 18 +++++++++---------
 .../menu/menu_state_connected_game.cpp         |  2 +-
 .../glest_game/menu/menu_state_custom_game.cpp |  2 +-
 .../sources/graphics/gl/texture_gl.cpp         |  2 ++
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/source/glest_game/game/game_constants.h b/source/glest_game/game/game_constants.h
index e4afc437e..bc95cfe4a 100644
--- a/source/glest_game/game/game_constants.h
+++ b/source/glest_game/game/game_constants.h
@@ -24,15 +24,15 @@ namespace Glest{ namespace Game{
 //	class GameConstants
 // =====================================================
 
-const Vec4f BLACK(0, 0, 0, 1);
-const Vec4f RED(1, 0, 0, 1);
-const Vec4f GREEN(0, 1, 0, 1);
-const Vec4f BLUE(0, 0, 1, 1);
-const Vec4f GLASS(1, 1, 1, 0.3);
-const Vec4f CYAN(0, 1, 1, 1);
-const Vec4f YELLOW(1, 1, 0, 1);
-const Vec4f MAGENTA(1, 0, 1, 1);
-const Vec4f WHITE(1, 1, 1, 1);
+const Vec4f BLACK(0.0f, 0.0f, 0.0f, 1.0f);
+const Vec4f RED(1.0f, 0.0f, 0.0f, 1.0f);
+const Vec4f GREEN(0.0f, 1.0f, 0.0f, 1.0f);
+const Vec4f BLUE(0.0f, 0.0f, 1.0f, 1.0f);
+const Vec4f GLASS(1.0f, 1.0f, 1.0f, 0.3f);
+const Vec4f CYAN(0.0f, 1.0f, 1.0f, 1.0f);
+const Vec4f YELLOW(1.0f, 1.0f, 0.0f, 1.0f);
+const Vec4f MAGENTA(1.0f, 0.0f, 1.0f, 1.0f);
+const Vec4f WHITE(1.0f, 1.0f, 1.0f, 1.0f);
 
 enum PathFinderType {
 	pfBasic,
diff --git a/source/glest_game/menu/menu_state_connected_game.cpp b/source/glest_game/menu/menu_state_connected_game.cpp
index 8077c8faf..a732c3e26 100644
--- a/source/glest_game/menu/menu_state_connected_game.cpp
+++ b/source/glest_game/menu/menu_state_connected_game.cpp
@@ -547,7 +547,7 @@ void MenuStateConnectedGame::render() {
 				renderer.renderLabel(&labelPlayers[i],&playerColor);
 
 				// Blend the color with white so make it more readable
-				Vec4f newColor(1.f, 1.f, 1.f, 0.57);
+				Vec4f newColor(1.f, 1.f, 1.f, 0.57f);
 				renderer.renderLabel(&labelPlayers[i],&newColor);
 
 				//int quadWidth = labelPlayerNames[i].getX() - labelPlayers[i].getX() - 5;
diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp
index 0d0ed806b..5977ab22d 100644
--- a/source/glest_game/menu/menu_state_custom_game.cpp
+++ b/source/glest_game/menu/menu_state_custom_game.cpp
@@ -1072,7 +1072,7 @@ void MenuStateCustomGame::render() {
 					renderer.renderLabel(&labelPlayers[i],&playerColor);
 
 					// Blend the color with white so make it more readable
-					Vec4f newColor(1.f, 1.f, 1.f, 0.57);
+					Vec4f newColor(1.f, 1.f, 1.f, 0.57f);
 					renderer.renderLabel(&labelPlayers[i],&newColor);
 
 					//int quadWidth = labelPlayerNames[i].getX() - labelPlayers[i].getX() - 5;
diff --git a/source/shared_lib/sources/graphics/gl/texture_gl.cpp b/source/shared_lib/sources/graphics/gl/texture_gl.cpp
index ece719f99..8d1284988 100644
--- a/source/shared_lib/sources/graphics/gl/texture_gl.cpp
+++ b/source/shared_lib/sources/graphics/gl/texture_gl.cpp
@@ -441,6 +441,7 @@ void TextureCubeGl::end(){
 
 void TextureGl::OutputTextureDebugInfo(const Pixmap2D *pixmap,Texture::Format format, int components,const string path) {
 
+/*
 	GLint glFormat= toFormatGl(format, components);
 
 	printf("**** Texture filename: [%s] format = %d components = %d, glFormat = %d, path [%s]\n",pixmap->getPath().c_str(),format,components,glFormat,path.c_str());
@@ -460,6 +461,7 @@ void TextureGl::OutputTextureDebugInfo(const Pixmap2D *pixmap,Texture::Format fo
 	glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT, &compressed);
 	error = glGetError();
 	printf("**** Texture image compression format used: %d, error [%d]\n",compressed,error);
+*/
 }
 
 }}}//end namespace