[Scummvm-cvs-logs] CVS: scummvm/scumm palette_he.cpp,1.15,1.16

kirben kirben at users.sourceforge.net
Mon Apr 25 03:23:08 CEST 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31909/scumm

Modified Files:
	palette_he.cpp 
Log Message:

Minor cleanup


Index: palette_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/palette_he.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- palette_he.cpp	21 Apr 2005 19:27:16 -0000	1.15
+++ palette_he.cpp	25 Apr 2005 10:22:38 -0000	1.16
@@ -236,35 +236,32 @@
 }
 
 void ScummEngine_v99he::darkenPalette(int redScale, int greenScale, int blueScale, int startColor, int endColor) {
-	if (startColor <= endColor) {
-		uint8 *src, *dest;
-		int color, j;
-
-		for (j = startColor; j <= endColor; j++) {
-			src = _hePalettes + j * 3;
-			dest = src + 1024;
+	uint8 *src, *dst;
+	int color, j;
 
-			color = *src++;
-			color = color * redScale / 0xFF;
-			if (color > 255)
-				color = 255;
-			*dest++ = color;
+	src = _hePalettes + startColor * 3;
+	dst = _hePalettes + 1024 + startColor * 3;
+	for (j = startColor; j <= endColor; j++) {
+		color = *src++;
+		color = color * redScale / 0xFF;
+		if (color > 255)
+			color = 255;
+		*dst++ = color;
 
-			color = *src++;
-			color = color * greenScale / 0xFF;
-			if (color > 255)
-				color = 255;
-			*dest++ = color;
+		color = *src++;
+		color = color * greenScale / 0xFF;
+		if (color > 255)
+			color = 255;
+		*dst++ = color;
 
-			color = *src++;
-			color = color * blueScale / 0xFF;
-			if (color > 255)
-				color = 255;
-			*dest++ = color;
+		color = *src++;
+		color = color * blueScale / 0xFF;
+		if (color > 255)
+			color = 255;
+		*dst++ = color;
 
-			_hePalettes[1792 + j] = j;
-			setDirtyColors(j, endColor);
-		}
+		_hePalettes[1792 + j] = j;
+		setDirtyColors(j, endColor);
 	}
 }
 





More information about the Scummvm-git-logs mailing list