[Scummvm-cvs-logs] scummvm master -> ad7372b0c27f15e0f6313895c99963c9954758f8

[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:
ad7372b0c2 SHERLOCK: Fix for German version using hatpin/needle in Pratt's pillow


Commit: ad7372b0c27f15e0f6313895c99963c9954758f8
    https://github.com/scummvm/scummvm/commit/ad7372b0c27f15e0f6313895c99963c9954758f8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-02-13T19:44:39-05:00

Commit Message:
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

Changed paths:
    engines/sherlock/objects.cpp



diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 2a728f6..a89b8dc 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();