thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix actor gliding caused by my walk_script hack

Browse source 
svn-id: r6773
This commit is contained in:
Max Horn 2003-03-08 14:12:58 +00:00
parent 38371389ea
commit d24df8ff7a
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scumm/actor.cpp
View file

@ -1307,7 +1307,7 @@ void Actor::walkActor() {
int new_dir, box; int new_dir, box;
int16 foundPathX, foundPathY; 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 // FIXME - this is kind of a hack right now but it fixes the
// walk scripts in The Dig. // walk scripts in The Dig.
if (moving & MF_FROZEN) { if (moving & MF_FROZEN) {
@ -1316,14 +1316,15 @@ void Actor::walkActor() {
if (facing != new_dir) if (facing != new_dir)
setDirection(new_dir); setDirection(new_dir);
else else
moving = 0; moving &= ~MF_TURN;
} }
return; return;
} }
} else if (moving == 0) {
return;
} }
if (moving == 0)
return;
if (!(moving & MF_NEW_LEG)) { if (!(moving & MF_NEW_LEG)) {
if (moving & MF_IN_LEG && actorWalkStep()) if (moving & MF_IN_LEG && actorWalkStep())
return; return;