[Scummvm-cvs-logs] SF.net SVN: scummvm:[33656] scummvm/branches/branch-0-12-0/engines/scumm/ script_v6.cpp
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Wed Aug 6 12:32:45 CEST 2008
Revision: 33656
http://scummvm.svn.sourceforge.net/scummvm/?rev=33656&view=rev
Author: fingolfin
Date: 2008-08-06 10:32:45 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
Backported fix for bug #2016521
Modified Paths:
--------------
scummvm/branches/branch-0-12-0/engines/scumm/script_v6.cpp
Modified: scummvm/branches/branch-0-12-0/engines/scumm/script_v6.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/engines/scumm/script_v6.cpp 2008-08-06 10:32:20 UTC (rev 33655)
+++ scummvm/branches/branch-0-12-0/engines/scumm/script_v6.cpp 2008-08-06 10:32:45 UTC (rev 33656)
@@ -2390,6 +2390,15 @@
_actorToPrintStrFor = pop();
+ // WORKAROUND for bug #2016521: "DOTT: Bernard impersonating LaVerne"
+ // Original script did not check for VAR_EGO == 2 before executing
+ // a talkActor opcode.
+ if (_game.id == GID_TENTACLE && vm.slot[_currentScript].number == 307
+ && VAR(VAR_EGO) != 2 && _actorToPrintStrFor == 2) {
+ _scriptPointer += resStrLen(_scriptPointer) + 1;
+ return;
+ }
+
_string[0].loadDefault();
actorTalk(_scriptPointer);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list