thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Paul Gilbert 2019-05-21 18:30:10 -07:00
parent 6a6506bec4
commit 6408771673
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS.md
View file

@ -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 - Fixed an issue in the wig maker room in the German version of SPY Fox 3: Operation Ozone
which makes the game completable. which makes the game completable.
Sherlock:
- Fixed crash in Spanish version talking to lady in Tailor shop
SKY: SKY:
- Added workaround for original game bug to improve intro and not cut off images which exist - Added workaround for original game bug to improve intro and not cut off images which exist
as fullscreen (320x200px) in the game data files. as fullscreen (320x200px) in the game data files.

4
engines/sherlock/tattoo/tattoo_talk.cpp
View file

@ -435,6 +435,10 @@ OpcodeReturn TattooTalk::cmdPlaySong(const byte *&str) {
OpcodeReturn TattooTalk::cmdRestorePeopleSequence(const byte *&str) { OpcodeReturn TattooTalk::cmdRestorePeopleSequence(const byte *&str) {
int npcNum = *++str - 1; 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; TattooPeople &people = *(TattooPeople *)_vm->_people;
TattooPerson &person = people[npcNum]; TattooPerson &person = people[npcNum];
person._misc = 0; person._misc = 0;