[Scummvm-cvs-logs] scummvm master -> 8f1896b2e0b49d547ae51ef9e01597c90b542a1b

[Kirben]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
daefdc315b SCUMM: Fix bug #2034 - MANIAC V2: Early Collision with Green Tentacle
8f1896b2e0 Merge pull request #533 from segrax/master


Commit: daefdc315bdcb8a62f6e69d45a1f0b535fff46d5
    https://github.com/scummvm/scummvm/commit/daefdc315bdcb8a62f6e69d45a1f0b535fff46d5
Author: Robert Crossfield (robcrossfield at gmail.com)
Date: 2014-11-23T08:24:39+11:00

Commit Message:
SCUMM: Fix bug #2034 - MANIAC V2: Early Collision with Green Tentacle

Changed paths:
    engines/scumm/script_v0.cpp
    engines/scumm/script_v2.cpp



diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index a7999a2..af39fda 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -589,9 +589,9 @@ void ScummEngine_v0::o_loadRoomWithEgo() {
 		return;
 	}
 
-	// The original interpreter seems to set the actors new room X/Y to the last rooms X/Y
-	// This fixes a problem with MM: script 158 in room 12, the 'Oompf!' script
-	// This scripts runs before the actor position is set to the correct location
+	// The original interpreter sets the actors new room X/Y to the last rooms X/Y
+	// This fixes a problem with MM: script 158 in room 12, the 'Oomph!' script
+	// This scripts runs before the actor position is set to the correct room entry location
 	a->putActor(a->getPos().x, a->getPos().y, room);
 	_egoPositioned = false;
 
diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index 74d0aa2..a7ec2e6 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();


Commit: 8f1896b2e0b49d547ae51ef9e01597c90b542a1b
    https://github.com/scummvm/scummvm/commit/8f1896b2e0b49d547ae51ef9e01597c90b542a1b
Author: Kirben (kirben at optusnet.com.au)
Date: 2014-11-28T14:45:31+11:00

Commit Message:
Merge pull request #533 from segrax/master

SCUMM: Fix bug #2034 - MANIAC V2: Early Collision with Green Tentacle

Changed paths:
    engines/scumm/script_v0.cpp
    engines/scumm/script_v2.cpp