[Hgengine-cvs] SF.net SVN: hgengine:[92] Mercury2/src

[<cn...@us...>]

Revision: 92
          http://hgengine.svn.sourceforge.net/hgengine/?rev=92&view=rev
Author:   cnlohr
Date:     2008-12-30 05:11:42 +0000 (Tue, 30 Dec 2008)

Log Message:
-----------
fix warnings

Modified Paths:
--------------
    Mercury2/src/BMPLoader.cpp
    Mercury2/src/RenderableNode.cpp
    Mercury2/src/Texture.cpp

Modified: Mercury2/src/BMPLoader.cpp
===================================================================
--- Mercury2/src/BMPLoader.cpp	2008-12-30 04:59:37 UTC (rev 91)
+++ Mercury2/src/BMPLoader.cpp	2008-12-30 05:11:42 UTC (rev 92)
@@ -140,7 +140,7 @@
 	unsigned long row, pixel;
 	unsigned char* rowPtr;
 	
-	for (unsigned int x = 0; !feof(file) && (x+3 < rawlength); x += 3)
+	for (unsigned int x = 0; !feof(file) && (x+3 < (unsigned)rawlength); x += 3)
 	{
 		memset(b, 0, sizeof(unsigned char) * 3);
 //		file->Read((char*)&b, sizeof(unsigned char) * 3);

Modified: Mercury2/src/RenderableNode.cpp
===================================================================
--- Mercury2/src/RenderableNode.cpp	2008-12-30 04:59:37 UTC (rev 91)
+++ Mercury2/src/RenderableNode.cpp	2008-12-30 05:11:42 UTC (rev 92)
@@ -111,7 +111,7 @@
 {
 	static unsigned long waitTime = 0;
 	RenderableNode* rn;
-	if ( rn = Cast(n) )
+	if ( ( rn = Cast(n) ) )
 	{
 		MSemaphoreDecOnDestroy s( &(rn->m_semaphore) );
 		

Modified: Mercury2/src/Texture.cpp
===================================================================
--- Mercury2/src/Texture.cpp	2008-12-30 04:59:37 UTC (rev 91)
+++ Mercury2/src/Texture.cpp	2008-12-30 05:11:42 UTC (rev 92)
@@ -52,6 +52,11 @@
 			break;
 		case RGBA:
 			ByteType = GL_RGBA;
+			break;
+		default:
+			printf( "Unsupported byte type (%d) in Texture::LoadFromRaw\n", m_raw->m_ColorByteType );
+			ByteType = GL_RGB;
+			break;
 	}
 
 	glBindTexture(GL_TEXTURE_2D, m_textureID);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.