[Scummvm-cvs-logs] CVS: scummvm/scumm palette.cpp,2.34,2.35
kirben
kirben at users.sourceforge.net
Mon Apr 18 23:45:43 CEST 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4276/scumm
Modified Files:
palette.cpp
Log Message:
Add different in monkey2 FM-TOWNS
Index: palette.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/palette.cpp,v
retrieving revision 2.34
retrieving revision 2.35
diff -u -d -r2.34 -r2.35
--- palette.cpp 19 Apr 2005 04:16:03 -0000 2.34
+++ palette.cpp 19 Apr 2005 06:44:54 -0000 2.35
@@ -643,6 +643,13 @@
if (_roomResource == 0) // FIXME - HACK to get COMI demo working
return;
+ int max;
+ if ((_features & GF_FMTOWNS) && (_version == 5)) {
+ max = 63;
+ } else {
+ max = 255;
+ }
+
if (startColor <= endColor) {
const byte *cptr;
const byte *palptr;
@@ -662,20 +669,20 @@
color = *cptr++;
color = color * redScale / 0xFF;
- if (color > 255)
- color = 255;
+ if (color > max)
+ color = max;
_currentPalette[idx * 3 + 0] = color;
color = *cptr++;
color = color * greenScale / 0xFF;
- if (color > 255)
- color = 255;
+ if (color > max)
+ color = max;
_currentPalette[idx * 3 + 1] = color;
color = *cptr++;
color = color * blueScale / 0xFF;
- if (color > 255)
- color = 255;
+ if (color > max)
+ color = max;
_currentPalette[idx * 3 + 2] = color;
}
if (_heversion != 70)
More information about the Scummvm-git-logs
mailing list