diff options
| author | Max Horn | 2003-09-11 14:11:31 +0000 |
|---|---|---|
| committer | Max Horn | 2003-09-11 14:11:31 +0000 |
| commit | 6c4d6889f549dd09ef8b1e5faba59e77f5676991 (patch) | |
| tree | 498c7acde69da08e49a3af875c297f3397a011f6 /scumm/script_v2.cpp | |
| parent | 41a8905519b421efb0eb5b0776d139322625a2f9 (diff) | |
| download | scummvm-rg350-6c4d6889f549dd09ef8b1e5faba59e77f5676991.tar.gz scummvm-rg350-6c4d6889f549dd09ef8b1e5faba59e77f5676991.tar.bz2 scummvm-rg350-6c4d6889f549dd09ef8b1e5faba59e77f5676991.zip | |
hum, why was this not commited by CVS?
svn-id: r10175
Diffstat (limited to 'scumm/script_v2.cpp')
| -rw-r--r-- | scumm/script_v2.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp index 21bb3b2eb0..868c87cddc 100644 --- a/scumm/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -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); |