aboutsummaryrefslogtreecommitdiff
path: root/scumm/sound.cpp
diff options
context:
space:
mode:
authorPaweł Kołodziejski2003-01-25 18:41:32 +0000
committerPaweł Kołodziejski2003-01-25 18:41:32 +0000
commit8e8575003bbfecfad605dc3fa8b3723d3f55027d (patch)
tree424d8d9a83875ac1558cc467da0a59cd7039306a /scumm/sound.cpp
parentd942441f7f33a5d6898892fc64d777040a399b06 (diff)
downloadscummvm-rg350-8e8575003bbfecfad605dc3fa8b3723d3f55027d.tar.gz
scummvm-rg350-8e8575003bbfecfad605dc3fa8b3723d3f55027d.tar.bz2
scummvm-rg350-8e8575003bbfecfad605dc3fa8b3723d3f55027d.zip
implemented properly comi sound codecs
svn-id: r6538
Diffstat (limited to 'scumm/sound.cpp')
-rw-r--r--scumm/sound.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index 3a8fd9c9c5..d1a2e97047 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -1050,7 +1050,7 @@ void Sound::bundleMusicHandler(Scumm * scumm) {
ptr = _musicBundleBufOutput;
for (k = 0, l = _currentSampleBundleMusic; l < num; k++) {
- length = _scumm->_bundle->decompressMusicSampleByName(_nameBundleMusic, l, (_musicBundleBufOutput + ((k * 0x2000) + _offsetBufBundleMusic)), _bundleSampleChannels);
+ length = _scumm->_bundle->decompressMusicSampleByName(_nameBundleMusic, l, (_musicBundleBufOutput + ((k * 0x2000) + _offsetBufBundleMusic)));
_offsetSampleBundleMusic += length;
if (l == 0) {
@@ -1169,13 +1169,13 @@ int Sound::playBundleSound(char *sound) {
strcpy(name, sound);
strcat(name, ".IMX");
ptr = (byte *)malloc(1000000);
- if (_scumm->_bundle->decompressVoiceSampleByName(name, ptr, channels) == 0) {
+ if (_scumm->_bundle->decompressVoiceSampleByName(name, ptr) == 0) {
delete ptr;
return -1;
}
} else {
ptr = (byte *)malloc(1000000);
- if (_scumm->_bundle->decompressVoiceSampleByName(sound, ptr, channels) == 0) {
+ if (_scumm->_bundle->decompressVoiceSampleByName(sound, ptr) == 0) {
delete ptr;
return -1;
}