diff options
| author | Travis Howell | 2009-08-16 00:20:23 +0000 |
|---|---|---|
| committer | Travis Howell | 2009-08-16 00:20:23 +0000 |
| commit | 09845556e0383fb187f548c7cfc1a68b22329f7e (patch) | |
| tree | 01f49c1d3da2c69a9172d80a0ad421997c3d93ec /engines/scumm/he | |
| parent | 8e417b0884e676ff5fe297d1642c9d8499ad9b90 (diff) | |
| download | scummvm-rg350-09845556e0383fb187f548c7cfc1a68b22329f7e.tar.gz scummvm-rg350-09845556e0383fb187f548c7cfc1a68b22329f7e.tar.bz2 scummvm-rg350-09845556e0383fb187f548c7cfc1a68b22329f7e.zip | |
Revert revision 43410, and add alternative fix.
svn-id: r43416
Diffstat (limited to 'engines/scumm/he')
| -rw-r--r-- | engines/scumm/he/palette_he.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/engines/scumm/he/palette_he.cpp b/engines/scumm/he/palette_he.cpp index 02f3f3fc5c..ff29f9ecd0 100644 --- a/engines/scumm/he/palette_he.cpp +++ b/engines/scumm/he/palette_he.cpp @@ -33,27 +33,6 @@ namespace Scumm { -uint8 *ScummEngine::getHEPaletteSlot(uint16 palSlot) { - assertRange(0, palSlot, _numPalettes, "palette"); - - if (_game.heversion >= 99) { - if (palSlot) - return _hePalettes + palSlot * _hePaletteSlot + 768; - else - return _hePalettes + _hePaletteSlot + 768; - } - - return NULL; -} - -uint16 ScummEngine::get16BitColor(uint8 r, uint8 g, uint8 b) { - uint16 ar = (r >> 3) << 10; - uint16 ag = (g >> 3) << 5; - uint16 ab = (b >> 3) << 0; - uint16 col = ar | ag | ab; - return col; -} - void ScummEngine_v71he::remapHEPalette(const uint8 *src, uint8 *dst) { int r, g, b, sum, bestitem, bestsum; int ar, ag, ab; |