From e7027503f1b0bfbce5f700a9c2e14079105d88d1 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 6 Aug 2008 10:32:20 +0000
Subject: Workaround for bug #2016521 (DOTT: Bernard impersonating LaVerne)

svn-id: r33655
---
 engines/scumm/script_v6.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index 04ea53137b..b9a00e6d38 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -2390,6 +2390,15 @@ void ScummEngine_v6::o6_talkActor() {
 
 	_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);
 
-- 
cgit v1.2.3