diff options
| author | Travis Howell | 2006-02-12 06:43:42 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-02-12 06:43:42 +0000 |
| commit | 86ee0df205b267cc3bea1381dbafee8bb85d15ab (patch) | |
| tree | 3f605e9f80a06c71c7f5ef7442f4292a402e1d28 /engines | |
| parent | 37bc512d649b0e17591ebe55e94003d047631de0 (diff) | |
| download | scummvm-rg350-86ee0df205b267cc3bea1381dbafee8bb85d15ab.tar.gz scummvm-rg350-86ee0df205b267cc3bea1381dbafee8bb85d15ab.tar.bz2 scummvm-rg350-86ee0df205b267cc3bea1381dbafee8bb85d15ab.zip | |
A few corrections from disasm., checked against all versions
svn-id: r20594
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/actor.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp index 3353db0151..e6243b3a57 100644 --- a/engines/scumm/actor.cpp +++ b/engines/scumm/actor.cpp @@ -1583,10 +1583,14 @@ void Actor::startWalkActor(int destX, int destY, int dir) { } if (!isInCurrentRoom()) { - _pos.x = abr.x; - _pos.y = abr.y; - if (!(_vm->_version == 6 && _ignoreTurns) && dir != -1) - setDirection(dir); + if (_vm->_version <= 6) { + _pos.x = abr.x; + _pos.y = abr.y; + if (_ignoreTurns == false && dir != -1) + _facing = dir; + } else { + debug(0, "startWalkActor: attempting to walk actor %d who is not in this room", _number); + } return; } |