aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Kagerer2010-10-09 14:55:33 +0000
committerFlorian Kagerer2010-10-09 14:55:33 +0000
commit5ce63fb78f16dde136019f33c942fb19ffcf3c5b (patch)
treeadb5c8ea60a6ebaed180db73d2e8aedf486758ff
parent212d6cc1f01955a8c54d0aef782a925cd57f1ac5 (diff)
downloadscummvm-rg350-5ce63fb78f16dde136019f33c942fb19ffcf3c5b.tar.gz
scummvm-rg350-5ce63fb78f16dde136019f33c942fb19ffcf3c5b.tar.bz2
scummvm-rg350-5ce63fb78f16dde136019f33c942fb19ffcf3c5b.zip
KYRA: fix regression in Screen_v2::generateOverlay()
(very noticeable in LOL PC-98) svn-id: r53102
-rw-r--r--engines/kyra/screen_v2.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/screen_v2.cpp b/engines/kyra/screen_v2.cpp
index 216bf07f6f..4d90bf2bab 100644
--- a/engines/kyra/screen_v2.cpp
+++ b/engines/kyra/screen_v2.cpp
@@ -64,9 +64,9 @@ uint8 *Screen_v2::generateOverlay(const Palette &pal, uint8 *buffer, int opColor
}
for (int i = 1; i != 256; ++i) {
- const byte curR = pal[i * 3 + 0] - ((((pal[i * 3 + 0] - opR) * weight) >> 7) & 0x7F);
- const byte curG = pal[i * 3 + 1] - ((((pal[i * 3 + 1] - opG) * weight) >> 7) & 0x7F);
- const byte curB = pal[i * 3 + 2] - ((((pal[i * 3 + 2] - opB) * weight) >> 7) & 0x7F);
+ const byte curR = pal[i * 3 + 0] - (((pal[i * 3 + 0] - opR) * weight) >> 7);
+ const byte curG = pal[i * 3 + 1] - (((pal[i * 3 + 1] - opG) * weight) >> 7);
+ const byte curB = pal[i * 3 + 2] - (((pal[i * 3 + 2] - opB) * weight) >> 7);
uint16 idxSum = _use16ColorMode ? 0xFFFF : 0x7FFF;
byte index = opColor;