aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2011-08-26 06:49:00 +0200
committerJohannes Schickel2011-08-26 06:49:00 +0200
commitcef09b345b73042a6459f6e7e21b3adc7ca875b2 (patch)
treea8159689263efe9b60ce226674fa3726f4fb4d70
parent618d01c41c9e8507408b117dfa63750975fec68b (diff)
downloadscummvm-rg350-cef09b345b73042a6459f6e7e21b3adc7ca875b2.tar.gz
scummvm-rg350-cef09b345b73042a6459f6e7e21b3adc7ca875b2.tar.bz2
scummvm-rg350-cef09b345b73042a6459f6e7e21b3adc7ca875b2.zip
SCUMM: Fix bug in Indy4 Amiga's implementation of darkenPalette.
-rw-r--r--engines/scumm/palette.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/palette.cpp b/engines/scumm/palette.cpp
index c00a117751..216708f098 100644
--- a/engines/scumm/palette.cpp
+++ b/engines/scumm/palette.cpp
@@ -884,7 +884,7 @@ void ScummEngine::darkenPalette(int redScale, int greenScale, int blueScale, int
//bool remappedVerbColors = false;
bool remappedRoomColors = false;
- bool cycleFlag = (blueScale <= 250 && greenScale <= 250 && redScale <= 250);
+ bool cycleFlag = (blueScale >= 250 && greenScale >= 250 && redScale >= 250);
const byte *palptr = getPalettePtr(_curPalIndex, _roomResource) + startColor * 3;
@@ -923,7 +923,7 @@ void ScummEngine::darkenPalette(int redScale, int greenScale, int blueScale, int
int idx = _roomPalette[i] + 16;
bool mappedInRange = (startColor <= idx && idx <= endColor);
- if (inRange == mappedInRange || (remappedRoomColors && cycleFlag))
+ if (inRange != mappedInRange || (remappedRoomColors && cycleFlag))
mapRoomPalette(i);
}