thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add another check for ignoreTurns, ignoreTurns.

Browse source 
Should be complete for scumm7 games

svn-id: r12209
This commit is contained in:
Travis Howell 2004-01-07 06:08:54 +00:00
parent 3577dad949
commit 97cb72885a
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scumm/actor.cpp
View file

@ -302,7 +302,7 @@ int Actor::updateActorDirection(bool is_walking) {
int dir; int dir;
bool shouldInterpolate; bool shouldInterpolate;
if (ignoreTurns) if ((_vm->_version == 6) && ignoreTurns)
return facing; return facing;
dirType = (_vm->_features & GF_NEW_COSTUMES) ? _vm->akos_hasManyDirections(costume) : false; 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) { void Actor::turnToDirection(int newdir) {
if (newdir == -1) if (newdir == -1 || ignoreTurns)
return; return;
moving &= ~MF_TURN; moving &= ~MF_TURN;

2
scumm/script_v6.cpp
View file

@ -1764,7 +1764,7 @@ void ScummEngine_v6::o6_actorOps() {
a->setAnimVar(pop(), i); a->setAnimVar(pop(), i);
break; break;
case 215: // SO_ACTOR_IGNORE_TURNS_ON case 215: // SO_ACTOR_IGNORE_TURNS_ON
warning("ignoreTurns not yet implemented"); warning("ignoreTurns partially implemented");
a->ignoreTurns = true; a->ignoreTurns = true;
break; break;
case 216: // SO_ACTOR_IGNORE_TURNS_OFF case 216: // SO_ACTOR_IGNORE_TURNS_OFF