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

fix for #583166 (hoagie doesn't enter mansion correctly); moved putActor into class Actor

Browse source 
svn-id: r4587
This commit is contained in:
Max Horn 2002-07-18 15:45:10 +00:00
parent 4968bc7a21
commit 37921ed5b7
6 changed files with 65 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

10
script_v2.cpp
View file

@ -1393,7 +1393,7 @@ void Scumm::o6_putActorInRoom()
if (room != 0)
a->room = room;
}
putActor(a, x, y, room);
a->putActor(x, y, room);
}
@ -1413,7 +1413,7 @@ void Scumm::o6_putActorAtObject()
}
if (room == 0xFF)
room = a->room;
putActor(a, x, y, room);
a->putActor(x, y, room);
}
void Scumm::o6_faceActor()
@ -1489,7 +1489,7 @@ void Scumm::o6_loadRoomWithEgo()
a = derefActorSafe(_vars[VAR_EGO], "o_loadRoomWithEgo");
putActor(a, 0, 0, room);
a->putActor(0, 0, room);
_egoPositioned = false;
_vars[VAR_WALKTO_OBJ] = obj;
@ -1997,7 +1997,7 @@ void Scumm::o6_actorSet()
a->forceClip = 0;
FixRooms:;
if (a->isInCurrentRoom())
putActor(a, a->x, a->y, a->room);
a->putActor(a->x, a->y, a->room);
break;
case 96:
a->ignoreBoxes = 0;
@ -2045,7 +2045,7 @@ void Scumm::o6_actorSet()
break;
case 230: /* set direction */
a->moving &= ~MF_TURN;
a->setActorDirection(pop());
a->setDirection(pop());
break;
case 231: /* turn to direction */
a->turnToDirection(pop());