[Scummvm-git-logs] scummvm master -> 64087716736ae9ec26813b8a0d62c98694503504

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6408771673 SHERLOCK: RT: Fix Spanish crash talking to lady in Tailor shop


Commit: 64087716736ae9ec26813b8a0d62c98694503504
    https://github.com/scummvm/scummvm/commit/64087716736ae9ec26813b8a0d62c98694503504
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-05-21T18:30:10-07:00

Commit Message:
SHERLOCK: RT: Fix Spanish crash talking to lady in Tailor shop

Changed paths:
    NEWS.md
    engines/sherlock/tattoo/tattoo_talk.cpp


diff --git a/NEWS.md b/NEWS.md
index 37353a8..b44a21c 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -58,6 +58,9 @@ For a more comprehensive changelog of the latest experimental code, see:
    - Fixed an issue in the wig maker room in the German version of SPY Fox 3: Operation Ozone
      which makes the game completable.
 
+Sherlock:
+   - Fixed crash in Spanish version talking to lady in Tailor shop
+
  SKY:
    - Added workaround for original game bug to improve intro and not cut off images which exist
      as fullscreen (320x200px) in the game data files.
diff --git a/engines/sherlock/tattoo/tattoo_talk.cpp b/engines/sherlock/tattoo/tattoo_talk.cpp
index 8eda736..7a31431 100644
--- a/engines/sherlock/tattoo/tattoo_talk.cpp
+++ b/engines/sherlock/tattoo/tattoo_talk.cpp
@@ -435,6 +435,10 @@ OpcodeReturn TattooTalk::cmdPlaySong(const byte *&str) {
 
 OpcodeReturn TattooTalk::cmdRestorePeopleSequence(const byte *&str) {
 	int npcNum = *++str - 1;
+	// WORKAROUND: Fix script error talking to woman in Tailor shop
+	if (npcNum == 111 && _vm->getLanguage() == Common::ES_ESP)
+		npcNum = 5;
+
 	TattooPeople &people = *(TattooPeople *)_vm->_people;
 	TattooPerson &person = people[npcNum];
 	person._misc = 0;