aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWalter van Niftrik2009-06-05 01:12:52 +0000
committerWalter van Niftrik2009-06-05 01:12:52 +0000
commit3c58a6ca8f1e74bc9f7ba7022d01b95710d5b03e (patch)
treed6909037bd88af37654f8cdfa59f2788a1bb65fa
parentde348d6fa8bf41ad30f2b85357cd4d20ad64f3e9 (diff)
downloadscummvm-rg350-3c58a6ca8f1e74bc9f7ba7022d01b95710d5b03e.tar.gz
scummvm-rg350-3c58a6ca8f1e74bc9f7ba7022d01b95710d5b03e.tar.bz2
scummvm-rg350-3c58a6ca8f1e74bc9f7ba7022d01b95710d5b03e.zip
SCI: Audio: Fixed bug in sample length computation.
svn-id: r41186
-rw-r--r--engines/sci/resource.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index 8299b718f4..24b4d9beed 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -1616,7 +1616,7 @@ Audio::AudioStream* AudioResource::getAudioStream(uint32 audioNumber, uint32 vol
}
}
- *sampleLen = (Audio::Mixer::FLAG_16BITS ? size >> 1 : size) * 60 / _audioRate;
+ *sampleLen = (flags & Audio::Mixer::FLAG_16BITS ? size >> 1 : size) * 60 / _audioRate;
} else {
warning("Failed to find audio entry (%i, %i, %i, %i, %i)", volume, (audioNumber >> 24) & 0xff,
(audioNumber >> 16) & 0xff, (audioNumber >> 8) & 0xff, audioNumber & 0xff);