aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2003-08-20 12:04:25 +0000
committerTravis Howell2003-08-20 12:04:25 +0000
commit327d37ae78608770599a03d6afa5ea3496f470e7 (patch)
tree2dbae1ba9b10ee82c2e3f6aff9821981199fb1b9
parentcc781cb9b11b4e3342e0661fd06daeec757e18ce (diff)
downloadscummvm-rg350-327d37ae78608770599a03d6afa5ea3496f470e7.tar.gz
scummvm-rg350-327d37ae78608770599a03d6afa5ea3496f470e7.tar.bz2
scummvm-rg350-327d37ae78608770599a03d6afa5ea3496f470e7.zip
v1 zak costume colors should be perfect now
svn-id: r9796
-rw-r--r--scumm/actor.cpp3
-rw-r--r--scumm/costume.cpp3
2 files changed, 6 insertions, 0 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index fb2ea1afbb..c43442cbf0 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -1227,6 +1227,9 @@ void Actor::setActorCostume(int c) {
}
+ if (_vm->_version == 1)
+ return;
+
if (_vm->_features & GF_NEW_COSTUMES) {
for (i = 0; i < 256; i++)
palette[i] = 0xFF;
diff --git a/scumm/costume.cpp b/scumm/costume.cpp
index d47dff5bb7..9089ec9fe4 100644
--- a/scumm/costume.cpp
+++ b/scumm/costume.cpp
@@ -743,6 +743,9 @@ void CostumeRenderer::setPalette(byte *palette) {
for (i = 0; i < 14; i++) {
_palette[i] = palette[i];
}
+ warning("palette[12] is %d", palette[12]);
+ warning("_palette[12] is %d", _palette[12]);
+
} else if (_vm->_features & GF_OLD_BUNDLE) {
if ((_vm->VAR(_vm->VAR_CURRENT_LIGHTS) & LIGHTMODE_actor_color)) {
memcpy(_palette, palette, 16);