From 654155bbe0db06ff23adbba748bc1c749c4f7e4c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 5 Oct 2015 22:47:14 -0400
Subject: SHERLOCK: SS: Fix garbage text in German version conversation

Talking to Watson in the Alleyway scene can result in the text
"Change Speaker to Sherlock Holmes" appearing mid-conversation,
even in DosBox. This workaround fixes this by skipping the text.
---
 engines/sherlock/scalpel/scalpel_journal.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'engines/sherlock/scalpel/scalpel_journal.cpp')

diff --git a/engines/sherlock/scalpel/scalpel_journal.cpp b/engines/sherlock/scalpel/scalpel_journal.cpp
index 787d899aee..e068e3bc48 100644
--- a/engines/sherlock/scalpel/scalpel_journal.cpp
+++ b/engines/sherlock/scalpel/scalpel_journal.cpp
@@ -631,6 +631,14 @@ void ScalpelJournal::record(int converseNum, int statementNum, bool replyOnly) {
 		Journal::record(converseNum, statementNum, replyOnly);
 }
 
+void ScalpelJournal::skipBadText(const byte *&msgP) {
+	// WORKAROUND: Skip over bad text in the original game
+	const char *BAD_PHRASE1 = "Change Speaker to Sherlock Holmes ";
+	
+	if (!strncmp((const char *)msgP, BAD_PHRASE1, strlen(BAD_PHRASE1)))
+		msgP += strlen(BAD_PHRASE1);
+}
+
 } // End of namespace Scalpel
 
 } // End of namespace Sherlock
-- 
cgit v1.2.3