diff options
| author | James Brown | 2002-11-22 08:14:33 +0000 | 
|---|---|---|
| committer | James Brown | 2002-11-22 08:14:33 +0000 | 
| commit | ea46bdabce32308f186db20cd13a50c792fb3118 (patch) | |
| tree | 27d038a105dd713d1391760b4949b43ad3f12c20 | |
| parent | a222ed17de708e8dbd35878fb26cead786853895 (diff) | |
| download | scummvm-rg350-ea46bdabce32308f186db20cd13a50c792fb3118.tar.gz scummvm-rg350-ea46bdabce32308f186db20cd13a50c792fb3118.tar.bz2 scummvm-rg350-ea46bdabce32308f186db20cd13a50c792fb3118.zip | |
Apply patch 642171. Fixes some Loom and FOA bugs. Regression testing doesn't reveil any hangs
introduced, but watch out for minor actor movement regressions.
svn-id: r5689
| -rw-r--r-- | scumm/actor.cpp | 6 | 
1 files changed, 1 insertions, 5 deletions
| diff --git a/scumm/actor.cpp b/scumm/actor.cpp index aa7f2ff0f3..beb1178f67 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -724,12 +724,8 @@ void Actor::turnToDirection(int newdir)  	moving &= ~MF_TURN;  	if (newdir != facing) { -		moving = MF_TURN; +		moving |= MF_TURN;  		newDirection = newdir; - -		// FIXME - workaround for bug #558236 -		if (_vm->_gameId == GID_INDY4 && room == 39 && x == 617 && y == 125 && newdir == 180) -			startAnimActor(standFrame);  	}  } | 
