aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/he
diff options
context:
space:
mode:
authorTravis Howell2009-01-04 03:49:23 +0000
committerTravis Howell2009-01-04 03:49:23 +0000
commitd0fc28bbd1bd5a3399c629e5d25ae3a64fef977c (patch)
tree68d39802db270642507b027fdeb25cfc059315de /engines/scumm/he
parent4670e37a78409bfe9279c5d73c8d581f0d66143e (diff)
downloadscummvm-rg350-d0fc28bbd1bd5a3399c629e5d25ae3a64fef977c.tar.gz
scummvm-rg350-d0fc28bbd1bd5a3399c629e5d25ae3a64fef977c.tar.bz2
scummvm-rg350-d0fc28bbd1bd5a3399c629e5d25ae3a64fef977c.zip
Use cache when converting 16bit colors, for faster conversions.
svn-id: r35714
Diffstat (limited to 'engines/scumm/he')
-rw-r--r--engines/scumm/he/wiz_he.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp
index fb1eb28765..3f4967efea 100644
--- a/engines/scumm/he/wiz_he.cpp
+++ b/engines/scumm/he/wiz_he.cpp
@@ -574,10 +574,10 @@ void Wiz::copyRaw16BitWizImage(uint8 *dst, const uint8 *src, int dstw, int dsth,
uint8 r = ((col >> 10) & 0x1F) << 3;
uint8 g = ((col >> 5) & 0x1F) << 3;
uint8 b = ((col >> 0) & 0x1F) << 3;
- col = _vm->remapPaletteColor(r, g, b, -1);
+ uint8 color = _vm->convert16BitColor(col, r, g, b);
if (transColor == -1 || transColor != col) {
- dst[i] = palPtr[col];
+ dst[i] = palPtr[color];
}
}
src += srcw * 2;
@@ -662,7 +662,7 @@ void Wiz::decompress16BitWizImage(uint8 *dst, int dstPitch, const uint8 *src, co
uint8 r = ((col >> 10) & 0x1F) << 3;
uint8 g = ((col >> 5) & 0x1F) << 3;
uint8 b = ((col >> 0) & 0x1F) << 3;
- col = _vm->remapPaletteColor(r, g, b, -1);
+ col = _vm->convert16BitColor(col, r, g, b);
if (type == kWizXMap) {
*dstPtr = xmapPtr[col * 256 + *dstPtr];
@@ -696,7 +696,7 @@ void Wiz::decompress16BitWizImage(uint8 *dst, int dstPitch, const uint8 *src, co
uint8 r = ((col >> 10) & 0x1F) << 3;
uint8 g = ((col >> 5) & 0x1F) << 3;
uint8 b = ((col >> 0) & 0x1F) << 3;
- col = _vm->remapPaletteColor(r, g, b, -1);
+ col = _vm->convert16BitColor(col, r, g, b);
if (type == kWizXMap) {
*dstPtr = xmapPtr[col * 256 + *dstPtr];