diff options
| author | Travis Howell | 2004-02-18 04:21:19 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-02-18 04:21:19 +0000 |
| commit | 1f2ab0145bf11521d1cf34884b45db993a95ec5e (patch) | |
| tree | 4efb321ead4eb5d0699c5e130dc3e0800b7447af /scumm | |
| parent | 8e5df2bda3fb7d3e4f03d9ea3778a14aeb5c404e (diff) | |
| download | scummvm-rg350-1f2ab0145bf11521d1cf34884b45db993a95ec5e.tar.gz scummvm-rg350-1f2ab0145bf11521d1cf34884b45db993a95ec5e.tar.bz2 scummvm-rg350-1f2ab0145bf11521d1cf34884b45db993a95ec5e.zip | |
FT/DIG/COMI should always default to 100 for actor.forceclip.
svn-id: r12925
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/actor.cpp | 2 | ||||
| -rw-r--r-- | scumm/script_v6.cpp | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index fd81b87c28..9ee8d1db41 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -102,7 +102,7 @@ void Actor::initActor(int mode) { animSpeed = 0; ignoreBoxes = false; - forceClip = 0; + forceClip = (_vm->_version >= 7) ? 100 : 0; ignoreTurns = false; flip = 0; diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index 8681a7f170..797a689977 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -1846,19 +1846,13 @@ void ScummEngine_v6::o6_actorOps() { break; case 95: // SO_IGNORE_BOXES a->ignoreBoxes = 1; - if (_version >= 7) - a->forceClip = 100; - else - a->forceClip = 0; + a->forceClip = (_version >= 7) ? 100 : 0; if (a->isInCurrentRoom()) a->putActor(a->_pos.x, a->_pos.y, a->room); break; case 96: // SO_FOLLOW_BOXES a->ignoreBoxes = 0; - if (_version >= 7) - a->forceClip = 100; - else - a->forceClip = 0; + a->forceClip = (_version >= 7) ? 100 : 0; if (a->isInCurrentRoom()) a->putActor(a->_pos.x, a->_pos.y, a->room); break; |