SHERLOCK: Fix for switching speakers

2 files changed, 3 insertions, 2 deletions

diff --git a/engines/sherlock/tattoo/tattoo_people.cpp b/engines/sherlock/tattoo/tattoo_people.cpp
index b253afd1da..4e4f11b983 100644
--- a/engines/sherlock/tattoo/tattoo_people.cpp
+++ b/engines/sherlock/tattoo/tattoo_people.cpp
@@ -186,8 +186,7 @@ void TattooPeople::setTalkSequence(int speaker, int sequenceNum) {
 		// See if the NPC's sequence has to wait for an Abort Talk Code
 		if (person.hasAborts()) {
 			person._gotoSeq = newDir;
-		}
-		else {
+		} else {
 			if (person._seqTo) {
 				// Reset to previous value
 				person._walkSequences[person._sequenceNumber]._sequences[person._frameNumber] = person._seqTo;
diff --git a/engines/sherlock/tattoo/tattoo_talk.cpp b/engines/sherlock/tattoo/tattoo_talk.cpp
index 3a066712f5..8e57ad5d93 100644
--- a/engines/sherlock/tattoo/tattoo_talk.cpp
+++ b/engines/sherlock/tattoo/tattoo_talk.cpp
@@ -215,6 +215,8 @@ OpcodeReturn TattooTalk::cmdSwitchSpeaker(const byte *&str) {
 
 	people.setListenSequence(_speaker, 129);
 	_speaker = *++str - 1;
+	++str;
+
 	people.setTalkSequence(_speaker, 1);
 
 	return RET_SUCCESS;