thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Robert Crossfield 2014-11-22 10:21:32 +11:00
parent f94f48ae2b
commit daefdc315b
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
engines/scumm/script_v2.cpp
View file

@ -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();