[Scummvm-cvs-logs] CVS: scummvm/scumm palette.cpp,2.35,2.36

kirben kirben at users.sourceforge.net
Tue Apr 19 00:06:53 CEST 2005


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

Modified Files:
	palette.cpp 
Log Message:

Actually applies to all SCUMM 5/6 games.


Index: palette.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/palette.cpp,v
retrieving revision 2.35
retrieving revision 2.36
diff -u -d -r2.35 -r2.36
--- palette.cpp	19 Apr 2005 06:44:54 -0000	2.35
+++ palette.cpp	19 Apr 2005 07:06:05 -0000	2.36
@@ -586,6 +586,13 @@
 	// from within Room 23 (the big machine), as it has no shadow effects
 	// and thus doesn't result in any visual differences.
 
+	int max;
+	if (_version >= 5 && _version <= 6) {
+		max = 252;
+	} else {
+		max = 255;
+	}
+
 	if (_gameId == GID_SAMNMAX) {
 		for (i = 0; i < 256; i++)
 			_shadowPalette[i] = i;
@@ -605,12 +612,12 @@
 		int ar, ag, ab;
 		uint sum, bestsum, bestitem = 0;
 
-		if (r > 255)
-			r = 255;
-		if (g > 255)
-			g = 255;
-		if (b > 255)
-			b = 255;
+		if (r > max)
+			r = max;
+		if (g > max)
+			g = max;
+		if (b > max)
+			b = max;
 
 		bestsum = 32000;
 
@@ -644,8 +651,8 @@
 		return;
 
 	int max;
-	if ((_features & GF_FMTOWNS) && (_version == 5)) {
-		max = 63;
+	if (_version >= 5 && _version <= 6 && _heversion <= 60) {
+		max = 252;
 	} else {
 		max = 255;
 	}





More information about the Scummvm-git-logs mailing list