diff options
author | Travis Howell | 2004-01-07 06:08:54 +0000 |
---|---|---|
committer | Travis Howell | 2004-01-07 06:08:54 +0000 |
commit | 97cb72885ae4751036fe6aa6a6cb091b6fc86464 (patch) | |
tree | 388dac5caa096dd7915e061406d7bf477f4c7517 | |
parent | 3577dad9492e8b12f7ed389e2dc40f58d386b3c9 (diff) | |
download | scummvm-rg350-97cb72885ae4751036fe6aa6a6cb091b6fc86464.tar.gz scummvm-rg350-97cb72885ae4751036fe6aa6a6cb091b6fc86464.tar.bz2 scummvm-rg350-97cb72885ae4751036fe6aa6a6cb091b6fc86464.zip |
Add another check for ignoreTurns, ignoreTurns.
Should be complete for scumm7 games
svn-id: r12209
-rw-r--r-- | scumm/actor.cpp | 4 | ||||
-rw-r--r-- | scumm/script_v6.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index a2aec663a8..1739856a06 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -302,7 +302,7 @@ int Actor::updateActorDirection(bool is_walking) { int dir; bool shouldInterpolate; - if (ignoreTurns) + if ((_vm->_version == 6) && ignoreTurns) return facing; dirType = (_vm->_features & GF_NEW_COSTUMES) ? _vm->akos_hasManyDirections(costume) : false; @@ -723,7 +723,7 @@ void Actor::faceToObject(int obj) { } void Actor::turnToDirection(int newdir) { - if (newdir == -1) + if (newdir == -1 || ignoreTurns) return; moving &= ~MF_TURN; diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index 9e2bdfe3fb..da9f32f7ff 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -1764,7 +1764,7 @@ void ScummEngine_v6::o6_actorOps() { a->setAnimVar(pop(), i); break; case 215: // SO_ACTOR_IGNORE_TURNS_ON - warning("ignoreTurns not yet implemented"); + warning("ignoreTurns partially implemented"); a->ignoreTurns = true; break; case 216: // SO_ACTOR_IGNORE_TURNS_OFF |