[Scummvm-cvs-logs] scummvm master -> 97f7839f7190624c6d766b53162592c71d0fd2bc

[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:
97f7839f71 SHERLOCK: Handle difference in RT SOUND_CODE range


Commit: 97f7839f7190624c6d766b53162592c71d0fd2bc
    https://github.com/scummvm/scummvm/commit/97f7839f7190624c6d766b53162592c71d0fd2bc
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-05T22:17:30-04:00

Commit Message:
SHERLOCK: Handle difference in RT SOUND_CODE range

Changed paths:
    engines/sherlock/objects.cpp



diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index daef54e..0e8eb30 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -807,11 +807,11 @@ void Object::checkObject() {
 			} else if (v >= SOUND_CODE && (v < (SOUND_CODE + 30))) {
 				codeFound = true;
 				++_frameNumber;
-				v -= SOUND_CODE;
+				v -= SOUND_CODE + (IS_SERRATED_SCALPEL ? 1 : 0);
 
 				if (sound._soundOn && !_countCAnimFrames) {
-					if (!scene._sounds[v - 1]._name.empty() && sound._digitized)
-						sound.playLoadedSound(v - 1, WAIT_RETURN_IMMEDIATELY);
+					if (!scene._sounds[v]._name.empty() && sound._digitized)
+						sound.playLoadedSound(v, WAIT_RETURN_IMMEDIATELY);
 				}
 			} else if (v >= FLIP_CODE && v < (FLIP_CODE + 3)) {
 				// Flip code