diff options
| author | Travis Howell | 2003-08-20 11:45:40 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-08-20 11:45:40 +0000 |
| commit | 1757d5a4489aa17ef92056a304e2e610fd1e4f53 (patch) | |
| tree | 621e5068f3fd083dec4ed616560b854e5fcb2967 | |
| parent | 7651aa2bb7fac342a6d9aef2c37c25bfa1e9e975 (diff) | |
| download | scummvm-rg350-1757d5a4489aa17ef92056a304e2e610fd1e4f53.tar.gz scummvm-rg350-1757d5a4489aa17ef92056a304e2e610fd1e4f53.tar.bz2 scummvm-rg350-1757d5a4489aa17ef92056a304e2e610fd1e4f53.zip | |
v1 zak costume color almost all right.
svn-id: r9794
| -rw-r--r-- | scumm/costume.cpp | 11 | ||||
| -rw-r--r-- | scumm/script_v2.cpp | 8 |
2 files changed, 8 insertions, 11 deletions
diff --git a/scumm/costume.cpp b/scumm/costume.cpp index bf7c59e77d..d47dff5bb7 100644 --- a/scumm/costume.cpp +++ b/scumm/costume.cpp @@ -357,7 +357,7 @@ void CostumeRenderer::procC64(int actor) { palette[2] = v1_mm_actor_palatte_2[actor]; } else { palette[1] = 10; - palette[2] = _palette[0]; + palette[2] = _palette[actor]; } v1.skip_width >>= 3; @@ -740,11 +740,10 @@ void CostumeRenderer::setPalette(byte *palette) { byte color; if (_loaded._format == 0x57) { - _palette[0] = palette[0]; - return; - } - - if (_vm->_features & GF_OLD_BUNDLE) { + for (i = 0; i < 14; i++) { + _palette[i] = palette[i]; + } + } else if (_vm->_features & GF_OLD_BUNDLE) { if ((_vm->VAR(_vm->VAR_CURRENT_LIGHTS) & LIGHTMODE_actor_color)) { memcpy(_palette, palette, 16); } else { diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp index 80d6be6be5..d595610720 100644 --- a/scumm/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -696,12 +696,10 @@ void Scumm_v2::o2_actorSet() { break; case 2: // Actor Set Color - if (_version == 1) { - i = 0; - } else { + if (_version == 2) i = fetchScriptByte(); - } - a->palette[i] = arg; + + a->palette[act] = arg; a->needRedraw = true; break; |