[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,1.94,1.95

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv31023

Modified Files:
	scummvm.cpp 
Log Message:
cleanup

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- scummvm.cpp	13 Dec 2002 03:23:17 -0000	1.94
+++ scummvm.cpp	13 Dec 2002 17:12:02 -0000	1.95
@@ -1455,7 +1455,8 @@
 	int num = _palDirtyMax - first + 1;
 	int i;
 
-	byte palette_colors[1024],*p = palette_colors;
+	byte palette_colors[1024];
+	byte *p = palette_colors;
 
 	for (i = _palDirtyMin; i <= _palDirtyMax; i++) {
 		byte *data;
@@ -1469,18 +1470,18 @@
 		// before uploading them to the backend.
 
 		if (noir_mode) {
-			double r, g, b;
-			double brightness;
+			int r, g, b;
+			byte brightness;
 
-			r = (double) data[0];
-			g = (double) data[1];
-			b = (double) data[2];
+			r = data[0];
+			g = data[1];
+			b = data[2];
 
-			brightness = (0.299 * r + 0.587 * g + 0.114 * b) + 0.5;
+			brightness = (byte)((0.299 * r + 0.587 * g + 0.114 * b) + 0.5);
 
-			*p++ = (byte) brightness;
-			*p++ = (byte) brightness;
-			*p++ = (byte) brightness;
+			*p++ = brightness;
+			*p++ = brightness;
+			*p++ = brightness;
 			*p++ = 0;
 		} else {
 			*p++ = data[0];