diff options
| author | Max Horn | 2003-01-13 14:04:41 +0000 |
|---|---|---|
| committer | Max Horn | 2003-01-13 14:04:41 +0000 |
| commit | 020a1c3e2d7dee95c9b6135a7f16ab23c688e22b (patch) | |
| tree | 8c0340a0aa006e57b145e9cebc02ea896262d4af /scumm/actor.cpp | |
| parent | e704837f5c987a840c6ef690807c319425b85ea5 (diff) | |
| download | scummvm-rg350-020a1c3e2d7dee95c9b6135a7f16ab23c688e22b.tar.gz scummvm-rg350-020a1c3e2d7dee95c9b6135a7f16ab23c688e22b.tar.bz2 scummvm-rg350-020a1c3e2d7dee95c9b6135a7f16ab23c688e22b.zip | |
fixed COMI actor scaling, again
svn-id: r6443
Diffstat (limited to 'scumm/actor.cpp')
| -rw-r--r-- | scumm/actor.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index 2066f01500..fc51f7c177 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -368,6 +368,13 @@ void Actor::setupActorScale() return; scale = _vm->getScale(walkbox, x, y); + if (_vm->_features & GF_AFTER_V8) { + // At least in COMI, scale values are clipped to range 1-255 + if (scale < 1) + scale = 1; + else if (scale > 255) + scale = 255; + } // FIXME - Hack for The Dig 'Tomb' (room 88) // Otherwise walking to the far-left door causes the actor @@ -393,12 +400,6 @@ void Actor::setupActorScale() } if (scale > 255) { - if (_vm->_features & GF_AFTER_V8) { - // In COMI, the scale values often are bigger than 255; - // however, the original engine seems to just cap them at 255, - // hence we do the same (the result looks correct, too); - scale = 255; - } else warning("Actor %d at %d, scale %d out of range", number, y, scale); } scalex = (byte)scale; |