diff options
| author | Paweł Kołodziejski | 2004-01-06 17:28:29 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2004-01-06 17:28:29 +0000 |
| commit | 8fd123992d746a3afa683b60790668757d0c9437 (patch) | |
| tree | 5f9b3d854b8aad9c40e50e7cf0e51e3485bc6c33 /scumm/sound.cpp | |
| parent | 2c2ae5f59ff309950fe5ffabbdb309b89f7531b8 (diff) | |
| download | scummvm-rg350-8fd123992d746a3afa683b60790668757d0c9437.tar.gz scummvm-rg350-8fd123992d746a3afa683b60790668757d0c9437.tar.bz2 scummvm-rg350-8fd123992d746a3afa683b60790668757d0c9437.zip | |
synced imuse digital with local tree
svn-id: r12187
Diffstat (limited to 'scumm/sound.cpp')
| -rw-r--r-- | scumm/sound.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index ade7faf0ba..91f007e684 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -23,7 +23,7 @@ #include "stdafx.h" #include "scumm/actor.h" #include "scumm/imuse.h" -#include "scumm/imuse_digi.h" +#include "scumm/imuse_digi/dimuse.h" #include "scumm/scumm.h" #include "scumm/sound.h" @@ -126,11 +126,6 @@ void Sound::playSound(int soundID) { return; } - if (_scumm->_features & GF_DIGI_IMUSE) { - _scumm->_musicEngine->startSound(soundID); - return; - } - // Support for SFX in Monkey Island 1, Mac version // This is rather hackish right now, but works OK. SFX are not sounding // 100% correct, though, not sure right now what is causing this. @@ -815,7 +810,6 @@ void Sound::startSfxSound(File *file, int file_size, PlayingSoundHandle *handle, AudioStream *input; - if (file_size > 0) { if (_vorbis_mode) { #ifdef USE_VORBIS @@ -831,7 +825,8 @@ void Sound::startSfxSound(File *file, int file_size, PlayingSoundHandle *handle, } if (_scumm->_imuseDigital) { - _scumm->_imuseDigital->startSound(kTalkSoundID, 0, input); + _scumm->_imuseDigital->stopSound(kTalkSoundID); + _scumm->_imuseDigital->startVoice(kTalkSoundID, input); } else { _scumm->_mixer->playInputStream(handle, input, false, 255, 0, id); } |