aboutsummaryrefslogtreecommitdiff
path: root/scumm/actor.cpp
diff options
context:
space:
mode:
authorTravis Howell2004-01-11 08:59:51 +0000
committerTravis Howell2004-01-11 08:59:51 +0000
commita578817f98d6f26decee2cfd12fbbc535c12616e (patch)
treeec31aa654501da910900a646fd5ae3f662621ddc /scumm/actor.cpp
parentb3e44d8f00b763b09ab8979b98a5024cf802343d (diff)
downloadscummvm-rg350-a578817f98d6f26decee2cfd12fbbc535c12616e.tar.gz
scummvm-rg350-a578817f98d6f26decee2cfd12fbbc535c12616e.tar.bz2
scummvm-rg350-a578817f98d6f26decee2cfd12fbbc535c12616e.zip
Ooops
svn-id: r12316
Diffstat (limited to 'scumm/actor.cpp')
-rw-r--r--scumm/actor.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index 254cba1542..0342eb05ba 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -963,10 +963,10 @@ void Actor::drawActorCostume() {
bcr->setPalette(palette);
bcr->setFacing(this);
- if (_vm->_features & GF_NEW_COSTUMES) {
+ if ((_vm->_features & GF_NEW_COSTUMES) && !(_vm->_features & GF_HUMONGOUS)) {
bcr->_zbuf = forceClip;
- if ((bcr->_zbuf == 100) || ((_vm->_features & GF_HUMONGOUS) && (bcr->_zbuf == 0))) {
+ if (bcr->_zbuf == 100) {
bcr->_zbuf = _vm->getMaskFromBox(walkbox);
if (bcr->_zbuf > _vm->gdi._numZBuffer-1)
bcr->_zbuf = _vm->gdi._numZBuffer-1;