hum, why was this not commited by CVS?
svn-id: r10175
This commit is contained in:
parent
41a8905519
commit
6c4d6889f5
2 changed files with 19 additions and 8 deletions
|
@ -1272,7 +1272,7 @@ void Scumm_v2::o2_lights() {
|
|||
|
||||
void Scumm_v2::o2_loadRoomWithEgo() {
|
||||
Actor *a;
|
||||
int obj, room, x, y;
|
||||
int obj, room, x, y, x2, y2, dir;
|
||||
|
||||
obj = getVarOrDirectWord(0x80);
|
||||
room = getVarOrDirectByte(0x40);
|
||||
|
@ -1287,6 +1287,10 @@ void Scumm_v2::o2_loadRoomWithEgo() {
|
|||
|
||||
startScene(a->room, a, obj);
|
||||
|
||||
getObjectXYPos(obj, x2, y2, dir);
|
||||
a->putActor(x2, y2, _currentRoom);
|
||||
a->setDirection(dir); // TODO: Original seems to "flip" dir here, need to investigate?
|
||||
|
||||
camera._dest.x = camera._cur.x = a->x;
|
||||
setCameraAt(a->x, a->y);
|
||||
setCameraFollows(a);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue