aboutsummaryrefslogtreecommitdiff
path: root/scumm/sound.cpp
diff options
context:
space:
mode:
authorPaweł Kołodziejski2002-12-28 15:48:37 +0000
committerPaweł Kołodziejski2002-12-28 15:48:37 +0000
commit9d664c9003ea5a7396c1478dc4b0f2e9d02494a2 (patch)
treee40ac6fe2eb29b63d76a1fa6d2f4b619229bdb5c /scumm/sound.cpp
parent642cfec55639d9f84b8f9e527ad828c1fbd7a438 (diff)
downloadscummvm-rg350-9d664c9003ea5a7396c1478dc4b0f2e9d02494a2.tar.gz
scummvm-rg350-9d664c9003ea5a7396c1478dc4b0f2e9d02494a2.tar.bz2
scummvm-rg350-9d664c9003ea5a7396c1478dc4b0f2e9d02494a2.zip
added 16 bits samples to playVoice
svn-id: r6235
Diffstat (limited to 'scumm/sound.cpp')
-rw-r--r--scumm/sound.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index 3b821774ab..b53417814a 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -1189,7 +1189,14 @@ int Sound::playBundleSound(char *sound) {
byte * final = (byte *)malloc(size);
memcpy(final, ptr, size);
- return _scumm->_mixer->playRaw(NULL, final, size, rate, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
+ if (bits == 8) {
+ return _scumm->_mixer->playRaw(NULL, final, size, rate, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
+ } else if (bits == 16){
+ return _scumm->_mixer->playRaw(NULL, final, size, rate, SoundMixer::FLAG_16BITS | SoundMixer::FLAG_AUTOFREE);
+ } else {
+ warning("Sound::playBundleSound() to do more options to playRaw...");
+ return -1;
+ }
}
int Sound::playSfxSound(void *sound, uint32 size, uint rate, bool isUnsigned) {