[Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.155,1.156
Jamieson Christian
jamieson630 at users.sourceforge.net
Mon Aug 18 07:02:02 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv29896/scummvm/scumm
Modified Files:
script_v5.cpp
Log Message:
Commented MI1 Demo fix.
Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- script_v5.cpp 17 Aug 2003 08:00:26 -0000 1.155
+++ script_v5.cpp 18 Aug 2003 13:55:12 -0000 1.156
@@ -1462,6 +1462,15 @@
a = derefActor(act, "o5_putActorInRoom");
+ // Fix for Bug #770710
+ // This fix fixes conflicting actor usage by two different scripts
+ // in MI1 Demo (PC GID_MONKEY_EGA or Amiga GID_MONKEY_VGA). The
+ // exit script for the LucasArts logo screen attempts to reset an
+ // actor that has already been set up for the next scene by the
+ // boot script. The fix cannot be used as a general behavior
+ // because it does cause GFX glitches in other games that try to
+ // do legitimate cleanup of actors that are in another room.
+ // (The Indy3 "Indy at Donovan's" cutscene, for instance.)
if (_gameId == GID_MONKEY_EGA || _gameId == GID_MONKEY_VGA) {
if (room == 0 && a->room != _currentRoom && a->room != room && _currentRoom != room) {
warning ("o5_putActorInRoom (%d [%d], %d) ignored", act, a->room, room);
More information about the Scummvm-git-logs
mailing list