From 1f2ab0145bf11521d1cf34884b45db993a95ec5e Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Wed, 18 Feb 2004 04:21:19 +0000 Subject: FT/DIG/COMI should always default to 100 for actor.forceclip. svn-id: r12925 --- scumm/script_v6.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'scumm/script_v6.cpp') 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; -- cgit v1.2.3