diff options
| author | Kirben | 2014-11-28 14:45:31 +1100 |
|---|---|---|
| committer | Kirben | 2014-11-28 14:45:31 +1100 |
| commit | 8f1896b2e0b49d547ae51ef9e01597c90b542a1b (patch) | |
| tree | 4f47433bc81367145661cce4a607440b62d00a3b /engines/scumm/script_v2.cpp | |
| parent | 7ff41ae9027ffe3186a0c0f471069d656dbda91b (diff) | |
| parent | daefdc315bdcb8a62f6e69d45a1f0b535fff46d5 (diff) | |
| download | scummvm-rg350-8f1896b2e0b49d547ae51ef9e01597c90b542a1b.tar.gz scummvm-rg350-8f1896b2e0b49d547ae51ef9e01597c90b542a1b.tar.bz2 scummvm-rg350-8f1896b2e0b49d547ae51ef9e01597c90b542a1b.zip | |
Merge pull request #533 from segrax/master
SCUMM: Fix bug #2034 - MANIAC V2: Early Collision with Green Tentacle
Diffstat (limited to 'engines/scumm/script_v2.cpp')
| -rw-r--r-- | engines/scumm/script_v2.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp index 74d0aa2483..a7ec2e644f 100644 --- a/engines/scumm/script_v2.cpp +++ b/engines/scumm/script_v2.cpp @@ -1390,7 +1390,14 @@ void ScummEngine_v2::o2_loadRoomWithEgo() { a = derefActor(VAR(VAR_EGO), "o2_loadRoomWithEgo"); - a->putActor(0, 0, room); + // The original interpreter sets the actors new room X/Y to the last rooms X/Y + // This fixes a problem with MM: script 161 in room 12, the 'Oomph!' script + // This scripts runs before the actor position is set to the correct room entry location + if ((_game.id == GID_MANIAC) && (_game.platform != Common::kPlatformNES)) { + a->putActor(a->getPos().x, a->getPos().y, room); + } else { + a->putActor(0, 0, room); + } _egoPositioned = false; x = (int8)fetchScriptByte(); |