aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/objects.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2015-06-05 22:17:30 -0400
committerPaul Gilbert2015-06-05 22:17:30 -0400
commit97f7839f7190624c6d766b53162592c71d0fd2bc (patch)
tree530783d7a98b2503fcb466490e450432bb22c7e8 /engines/sherlock/objects.cpp
parent384dad67297188c5d171d0ceff8c5d401ea2ac42 (diff)
downloadscummvm-rg350-97f7839f7190624c6d766b53162592c71d0fd2bc.tar.gz
scummvm-rg350-97f7839f7190624c6d766b53162592c71d0fd2bc.tar.bz2
scummvm-rg350-97f7839f7190624c6d766b53162592c71d0fd2bc.zip
SHERLOCK: Handle difference in RT SOUND_CODE range
Diffstat (limited to 'engines/sherlock/objects.cpp')
-rw-r--r--engines/sherlock/objects.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index daef54e4c0..0e8eb30511 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