diff options
author | Paul Gilbert | 2016-02-13 19:44:39 -0500 |
---|---|---|
committer | Paul Gilbert | 2016-02-13 19:44:39 -0500 |
commit | ad7372b0c27f15e0f6313895c99963c9954758f8 (patch) | |
tree | cb5609fe16a8d9810c2d34eeda121f7180a76ff8 | |
parent | b727e8da0868f2f1daa115d9aff4a5c381b92af8 (diff) | |
download | scummvm-rg350-ad7372b0c27f15e0f6313895c99963c9954758f8.tar.gz scummvm-rg350-ad7372b0c27f15e0f6313895c99963c9954758f8.tar.bz2 scummvm-rg350-ad7372b0c27f15e0f6313895c99963c9954758f8.zip |
SHERLOCK: Fix for German version using hatpin/needle in Pratt's pillow
In Pratt's Loft, the player can probe the pillow with either the needle
or the hatpin. However, the German version accidentally set up use
actions for the hatpin twice, resulting in a crash if you tried to use it
-rw-r--r-- | engines/sherlock/objects.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp index 2a728f6ec9..a89b8dce86 100644 --- a/engines/sherlock/objects.cpp +++ b/engines/sherlock/objects.cpp @@ -1061,6 +1061,11 @@ void Object::load(Common::SeekableReadStream &s, bool isRoseTattoo) { for (int idx = 0; idx < 6; ++idx) _use[idx].load(s, true); + // WORKAROUND: Fix German version using hatpin/pin in pillow in Pratt's loft + if (_use[1]._target == "Nadel" && _use[1]._verb == "Untersuche" + && _use[2]._target == "Nadel" && _use[2]._verb == "Untersuche") + _use[1]._target = "Alte Nadel"; + _quickDraw = s.readByte(); _scaleVal = s.readUint16LE(); _requiredFlag[1] = s.readSint16LE(); |