mirror of
https://github.com/libretro/scummvm.git
synced 2024-12-18 23:57:32 +00:00
actor ignoreTurns is complete for scumm6
svn-id: r12571
This commit is contained in:
parent
1f7a74099a
commit
45739906a5
@ -1292,7 +1292,7 @@ void Actor::startWalkActor(int destX, int destY, int dir) {
|
|||||||
if (!isInCurrentRoom()) {
|
if (!isInCurrentRoom()) {
|
||||||
_pos.x = abr.x;
|
_pos.x = abr.x;
|
||||||
_pos.y = abr.y;
|
_pos.y = abr.y;
|
||||||
if (dir != -1)
|
if (!(_vm->_version == 6 && ignoreTurns) && dir != -1)
|
||||||
setDirection(dir);
|
setDirection(dir);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -1897,7 +1897,6 @@ 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 partially implemented");
|
|
||||||
a->ignoreTurns = true;
|
a->ignoreTurns = true;
|
||||||
break;
|
break;
|
||||||
case 216: // SO_ACTOR_IGNORE_TURNS_OFF
|
case 216: // SO_ACTOR_IGNORE_TURNS_OFF
|
||||||
|
Loading…
Reference in New Issue
Block a user