aboutsummaryrefslogtreecommitdiff
path: root/scumm/actor.cpp
diff options
context:
space:
mode:
authorTravis Howell2004-01-07 06:08:54 +0000
committerTravis Howell2004-01-07 06:08:54 +0000
commit97cb72885ae4751036fe6aa6a6cb091b6fc86464 (patch)
tree388dac5caa096dd7915e061406d7bf477f4c7517 /scumm/actor.cpp
parent3577dad9492e8b12f7ed389e2dc40f58d386b3c9 (diff)
downloadscummvm-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
Diffstat (limited to 'scumm/actor.cpp')
-rw-r--r--scumm/actor.cpp4
1 files changed, 2 insertions, 2 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;