diff options
| author | Travis Howell | 2004-06-23 09:48:27 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-06-23 09:48:27 +0000 |
| commit | 04d4f7fca108fecf960f10828204c2baa72db837 (patch) | |
| tree | 1610f29cfbcbca4d365da230d0b2d8e44a482ddf /scumm/script_v6.cpp | |
| parent | 9cc7594384eabde62624d5fcda82605e5e66c5c4 (diff) | |
| download | scummvm-rg350-04d4f7fca108fecf960f10828204c2baa72db837.tar.gz scummvm-rg350-04d4f7fca108fecf960f10828204c2baa72db837.tar.bz2 scummvm-rg350-04d4f7fca108fecf960f10828204c2baa72db837.zip | |
Fix room changing in HE7 games.
svn-id: r14011
Diffstat (limited to 'scumm/script_v6.cpp')
| -rw-r--r-- | scumm/script_v6.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index 11c3ea515f..b03bf4a20e 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -1177,7 +1177,11 @@ void ScummEngine_v6::o6_putActorAtObject() { int room, obj, x, y; Actor *a; - obj = popRoomAndObj(&room); + if (_features & GF_HUMONGOUS) { + room = pop(); + obj = pop(); + } else + obj = popRoomAndObj(&room); a = derefActor(pop(), "o6_putActorAtObject"); if (whereIsObject(obj) != WIO_NOT_FOUND) { @@ -1257,7 +1261,11 @@ void ScummEngine_v6::o6_loadRoomWithEgo() { y = pop(); x = pop(); - obj = popRoomAndObj(&room); + if (_features & GF_HUMONGOUS) { + room = pop(); + obj = pop(); + } else + obj = popRoomAndObj(&room); a = derefActor(VAR(VAR_EGO), "o6_loadRoomWithEgo"); a->putActor(0, 0, room); |