Browse code

Fix warnings when compiling in C++ mode

Robert Cranston authored on 27/02/2024 02:27:43
Showing 2 changed files

... ...
@@ -479,7 +479,7 @@ void glutMainLoop()
479 479
          switch (event.type)
480 480
          {
481 481
          	case ClientMessage:
482
-         		if (event.xclient.data.l[0] == wmDeleteMessage) // quit!
482
+         		if ((Atom)event.xclient.data.l[0] == wmDeleteMessage) // quit!
483 483
          			gRunning = 0;
484 484
 	         	break;
485 485
          	case Expose: 
... ...
@@ -49,7 +49,7 @@ bool LoadTGATextureData(const char *filename, TextureData *texture)	// Loads A T
49 49
 	GLubyte *rowP;
50 50
 	int err;
51 51
 	GLubyte rle;
52
-	int b;
52
+	GLuint b;
53 53
 	long row, rowLimit;
54 54
 	GLubyte pixelData[4];	
55 55
 	
... ...
@@ -199,7 +199,7 @@ bool LoadTGATextureData(const char *filename, TextureData *texture)	// Loads A T
199 199
 	}
200 200
 
201 201
 	if (bytesPerPixel >= 3) // if not monochrome	
202
-	for (i = 0; i < (int)(imageSize); i += bytesPerPixel)	// Loop Through The Image Data
202
+	for (i = 0; i < imageSize; i += bytesPerPixel)	// Loop Through The Image Data
203 203
 	{		// Swaps The 1st And 3rd Bytes ('R'ed and 'B'lue)
204 204
 		temp = texture->imageData[i];		// Temporarily Store The Value At Image Data 'i'
205 205
 		texture->imageData[i] = texture->imageData[i + 2];	// Set The 1st Byte To The Value Of The 3rd Byte