diff options
| author | Travis Howell | 2004-01-22 03:22:01 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-01-22 03:22:01 +0000 |
| commit | 45739906a573b5e246f581512efed2d935b05336 (patch) | |
| tree | a6eea01dd68ac51ff13da32092dd1411e3b15cc4 /scumm | |
| parent | 1f7a74099a5b534ccbe5d9853cdb7830b13448bb (diff) | |
| download | scummvm-rg350-45739906a573b5e246f581512efed2d935b05336.tar.gz scummvm-rg350-45739906a573b5e246f581512efed2d935b05336.tar.bz2 scummvm-rg350-45739906a573b5e246f581512efed2d935b05336.zip | |
actor ignoreTurns is complete for scumm6
svn-id: r12571
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/actor.cpp | 2 | ||||
| -rw-r--r-- | scumm/script_v6.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index 8b6f0b5d9f..9efd80aa75 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -1292,7 +1292,7 @@ void Actor::startWalkActor(int destX, int destY, int dir) { if (!isInCurrentRoom()) { _pos.x = abr.x; _pos.y = abr.y; - if (dir != -1) + if (!(_vm->_version == 6 && ignoreTurns) && dir != -1) setDirection(dir); return; } diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index 3c6dc49288..c23c111d11 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -1897,7 +1897,6 @@ void ScummEngine_v6::o6_actorOps() { a->setAnimVar(pop(), i); break; case 215: // SO_ACTOR_IGNORE_TURNS_ON - warning("ignoreTurns partially implemented"); a->ignoreTurns = true; break; case 216: // SO_ACTOR_IGNORE_TURNS_OFF |