diff options
| author | Travis Howell | 2003-08-18 06:59:18 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-08-18 06:59:18 +0000 |
| commit | 311eb2678fbcfbd57606331bd88ff2cb24edde64 (patch) | |
| tree | d73ffccf41a136da56201172844aec4c29291f6d | |
| parent | 4bad55da8cc8e205df7222e2cf4d81780f4bd0af (diff) | |
| download | scummvm-rg350-311eb2678fbcfbd57606331bd88ff2cb24edde64.tar.gz scummvm-rg350-311eb2678fbcfbd57606331bd88ff2cb24edde64.tar.bz2 scummvm-rg350-311eb2678fbcfbd57606331bd88ff2cb24edde64.zip | |
Use correct costume color for darkness in v1 zak
svn-id: r9752
| -rw-r--r-- | scumm/costume.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/scumm/costume.cpp b/scumm/costume.cpp index bf787b2195..dd49885548 100644 --- a/scumm/costume.cpp +++ b/scumm/costume.cpp @@ -342,13 +342,19 @@ void CostumeRenderer::procC64(int actor) { // TODO: // * test masking (once we implement any masking for V1 games) - byte palette[4] = { 0, 8, 0, 0 }; + byte palette[4] = { 0, 0, 0, 0 }; if (_vm->_gameId == GID_MANIAC) { palette[1] = v1_mm_actor_palatte_1[actor]; palette[2] = v1_mm_actor_palatte_2[actor]; } else { - palette[2] = _palette[0]; + if (!(_vm->VAR(_vm->VAR_CURRENT_LIGHTS) & LIGHTMODE_actor_color)) { + palette[2] = 11; + palette[3] = 11; + } else { + palette[1] = 8; + palette[2] = _palette[0]; + } } v1.skip_width >>= 3; @@ -728,7 +734,8 @@ void CostumeRenderer::setPalette(byte *palette) { byte color; if (_loaded._format == 0x57) { - _palette[0] = palette[0]; + _palette[0] = palette[0]; + return; } |