diff options
| author | Max Horn | 2003-03-08 14:12:58 +0000 |
|---|---|---|
| committer | Max Horn | 2003-03-08 14:12:58 +0000 |
| commit | d24df8ff7a9916cb451779ef57716e7fdba2076c (patch) | |
| tree | bd158135681116bb8ab1f44f2255984ea793b545 /scumm | |
| parent | 38371389ea9024703a4f03264a775c59a0fc5097 (diff) | |
| download | scummvm-rg350-d24df8ff7a9916cb451779ef57716e7fdba2076c.tar.gz scummvm-rg350-d24df8ff7a9916cb451779ef57716e7fdba2076c.tar.bz2 scummvm-rg350-d24df8ff7a9916cb451779ef57716e7fdba2076c.zip | |
fix actor gliding caused by my walk_script hack
svn-id: r6773
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/actor.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index 75dfe2c92b..15c2be6226 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -1307,7 +1307,7 @@ void Actor::walkActor() { int new_dir, box; int16 foundPathX, foundPathY; - if (_vm->_features & GF_AFTER_V7 && !(_vm->_features & GF_AFTER_V8)) { + if (_vm->_features & GF_AFTER_V7) { // FIXME - this is kind of a hack right now but it fixes the // walk scripts in The Dig. if (moving & MF_FROZEN) { @@ -1316,14 +1316,15 @@ void Actor::walkActor() { if (facing != new_dir) setDirection(new_dir); else - moving = 0; + moving &= ~MF_TURN; } return; } - } else if (moving == 0) { - return; } + if (moving == 0) + return; + if (!(moving & MF_NEW_LEG)) { if (moving & MF_IN_LEG && actorWalkStep()) return; |