aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scumm/actor.cpp4
-rw-r--r--scumm/script_v6.cpp2
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