diff options
| author | Max Horn | 2003-05-13 23:03:18 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-13 23:03:18 +0000 |
| commit | 796fa748062564b4bf1993b6a150ce1d2da91259 (patch) | |
| tree | 727f5263616f959ee753bafaba185184d611ef4a /scumm/costume.cpp | |
| parent | fea9aed00ae4b542cac7a78d097c70e3613f9c7a (diff) | |
| download | scummvm-rg350-796fa748062564b4bf1993b6a150ce1d2da91259.tar.gz scummvm-rg350-796fa748062564b4bf1993b6a150ce1d2da91259.tar.bz2 scummvm-rg350-796fa748062564b4bf1993b6a150ce1d2da91259.zip | |
cleanup
svn-id: r7487
Diffstat (limited to 'scumm/costume.cpp')
| -rw-r--r-- | scumm/costume.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/scumm/costume.cpp b/scumm/costume.cpp index a4b3b8d1a4..1955494d88 100644 --- a/scumm/costume.cpp +++ b/scumm/costume.cpp @@ -1326,21 +1326,18 @@ void CostumeRenderer::setPalette(byte *palette) { memset(_palette, 8, 16); _palette[12] = 0; } - // FIXME: is this actually anything more than a guess (i.e. verified by disassmbly) ? - // A more "logical" thing would be if any 255 values in _palette are replaced - // by this value, at least that would closely parallel the actor palette usage in - // newer games (see below). _palette[_loaded._ptr[8]] = _palette[0]; } else { - for (i = 0; i < _loaded._numColors; i++) { - if ((_vm->VAR(_vm->VAR_CURRENT_LIGHTS) & LIGHTMODE_actor_color) || (_vm->_features & GF_AFTER_V6)) { + if ((_vm->_features & GF_AFTER_V6) || (_vm->VAR(_vm->VAR_CURRENT_LIGHTS) & LIGHTMODE_actor_color)) { + for (i = 0; i < _loaded._numColors; i++) { color = palette[i]; if (color == 255) color = _loaded._ptr[8 + i]; - } else { - color = (i == 12) ? 0 : 8; + _palette[i] = color; } - _palette[i] = color; + } else { + memset(_palette, 8, _loaded._numColors); + _palette[12] = 0; } } } |