aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2005-04-19 07:28:43 +0000
committerTravis Howell2005-04-19 07:28:43 +0000
commit9a758a9479767c97a0361959cae26fb82f7102df (patch)
tree25c2ad90d9312f658f6546c24c580ffe500e1dc8
parentad96d7fdb109c26474a0caefda2dba17c18ac9d6 (diff)
downloadscummvm-rg350-9a758a9479767c97a0361959cae26fb82f7102df.tar.gz
scummvm-rg350-9a758a9479767c97a0361959cae26fb82f7102df.tar.bz2
scummvm-rg350-9a758a9479767c97a0361959cae26fb82f7102df.zip
Simpler check.
svn-id: r17680
-rw-r--r--scumm/palette.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/scumm/palette.cpp b/scumm/palette.cpp
index 052d2f2acf..ab286465ff 100644
--- a/scumm/palette.cpp
+++ b/scumm/palette.cpp
@@ -239,11 +239,7 @@ void ScummEngine::setPaletteFromPtr(const byte *ptr, int numcolor) {
// if we remove this patch?
// Since it also causes problems in Zak256, I am turning it off for all V4 games and older.
if (_version >= 5 && _version <= 6) {
- if ((_heversion >= 80) && (i == 15 || r < 252 || g < 252 || b < 252)) {
- *dest++ = r;
- *dest++ = g;
- *dest++ = b;
- } else if (i <= 15 || r < 252 || g < 252 || b < 252) {
+ if ((_heversion <= 72 && i < 15) || i == 15 || r < 252 || g < 252 || b < 252) {
*dest++ = r;
*dest++ = g;
*dest++ = b;