diff options
| author | Travis Howell | 2009-01-04 00:58:45 +0000 |
|---|---|---|
| committer | Travis Howell | 2009-01-04 00:58:45 +0000 |
| commit | 4670e37a78409bfe9279c5d73c8d581f0d66143e (patch) | |
| tree | 3bf9094f7ff49bb7a81488a22a2f28d0d5916f8f /engines/scumm/palette.cpp | |
| parent | 3a4b4831dce092ac04f0756b48c3d73c8638449c (diff) | |
| download | scummvm-rg350-4670e37a78409bfe9279c5d73c8d581f0d66143e.tar.gz scummvm-rg350-4670e37a78409bfe9279c5d73c8d581f0d66143e.tar.bz2 scummvm-rg350-4670e37a78409bfe9279c5d73c8d581f0d66143e.zip | |
Use slow palette color match, for 16bit color HE games for now.
svn-id: r35713
Diffstat (limited to 'engines/scumm/palette.cpp')
| -rw-r--r-- | engines/scumm/palette.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/engines/scumm/palette.cpp b/engines/scumm/palette.cpp index 6d6c499462..4214ab2330 100644 --- a/engines/scumm/palette.cpp +++ b/engines/scumm/palette.cpp @@ -811,12 +811,16 @@ void ScummEngine_v8::desaturatePalette(int hueScale, int satScale, int lightScal int ScummEngine::remapPaletteColor(int r, int g, int b, int threshold) { - int i; - int ar, ag, ab; + byte *pal; + int ar, ag, ab, i; uint sum, bestsum, bestitem = 0; int startColor = (_game.version == 8) ? 24 : 1; - byte *pal = _currentPalette + startColor * 3; + + if (_game.heversion >= 99) + pal = _hePalettes + 1024 + startColor * 3; + else + pal = _currentPalette + startColor * 3; if (r > 255) r = 255; |