[Scummvm-cvs-logs] scummvm master -> 2e3ecb1be89e7744f1a4dff6309404f0833407ec

[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:
2e3ecb1be8 SHERLOCK: SS: Fix crash moving box at Tabbacconists


Commit: 2e3ecb1be89e7744f1a4dff6309404f0833407ec
    https://github.com/scummvm/scummvm/commit/2e3ecb1be89e7744f1a4dff6309404f0833407ec
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-12-01T20:23:29-05:00

Commit Message:
SHERLOCK: SS: Fix crash moving box at Tabbacconists

Changed paths:
    engines/sherlock/talk.cpp



diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index e9c5227..b239fd9 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -994,6 +994,10 @@ OpcodeReturn Talk::cmdAdjustObjectSequence(const byte *&str) {
 	_seqCount = str[1];
 	str += (str[0] & 127) + 2;
 
+	// WORKAROUND: Original German Scalpel crash when moving box at Tobacconists
+	if (_vm->getLanguage() == Common::DE_DEU && _scriptName == "Alfr30Z")
+		_seqCount = 16;
+
 	// Copy in the new sequence
 	for (int idx = 0; idx < _seqCount; ++idx, ++str)
 		scene._bgShapes[objId]._sequences[idx] = str[0] - 1;