aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2003-07-01 11:59:51 +0000
committerMax Horn2003-07-01 11:59:51 +0000
commitb13c0bb201bb1afdb50eb8735e4c9ec1fed5ba89 (patch)
tree3a0c519d64cabf5903cb4facef92d759f518790e
parent00d5c5af89da9f1aa7fcec723756dc95ecbec63a (diff)
downloadscummvm-rg350-b13c0bb201bb1afdb50eb8735e4c9ec1fed5ba89.tar.gz
scummvm-rg350-b13c0bb201bb1afdb50eb8735e4c9ec1fed5ba89.tar.bz2
scummvm-rg350-b13c0bb201bb1afdb50eb8735e4c9ec1fed5ba89.zip
Fix for bug #743041: ZAK256: wrong color in costume (intro). Thanks to Hibernatus for providing the deciding clue
svn-id: r8684
-rw-r--r--scumm/gfx.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index 64a9f80ce8..b3784cf55d 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -2591,13 +2591,14 @@ void Scumm::setPaletteFromPtr(const byte *ptr) {
g = *ptr++;
b = *ptr++;
- // This comparison might look wierd, but it's what the disassembly (DOTT) says!
+ // This comparison might look weird, but it's what the disassembly (DOTT) says!
// FIXME: Fingolfin still thinks it looks weird: the value 252 = 4*63 clearly comes from
// the days 6/6/6 palettes were used, OK. But it breaks MonkeyVGA, so I had to add a
// check for that. And somebody before me added a check for V7 games, turning this
// off there, too... I wonder if it hurts other games, too? What exactly is broken
// if we remove this patch?
- if ((_gameId == GID_MONKEY_VGA) || (_version >= 7) || (i <= 15 || r < 252 || g < 252 || b < 252)) {
+ // Since it also causes problems in Zak256, I am turning it off for all V4 games and older.
+ if ((_version <= 4) || (_version >= 7) || (i <= 15 || r < 252 || g < 252 || b < 252)) {
*dest++ = r;
*dest++ = g;
*dest++ = b;