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/string.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/string.cpp')
| -rw-r--r-- | scumm/string.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp index 0940a85527..be1c9128f3 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -28,7 +28,7 @@ #include "scumm/actor.h" #include "scumm/charset.h" #include "scumm/dialogs.h" -#include "scumm/imuse_digi.h" +#include "scumm/imuse_digi/dimuse.h" #include "scumm/verbs.h" #include "scumm/sound.h" @@ -921,7 +921,10 @@ const byte *ScummEngine::translateTextAndPlaySpeech(const byte *ptr) { pointer[j] = 0; // Play speech - _imuseDigital->playBundleSound(pointer); + if (!(_features & GF_DEMO) && (_gameId == GID_CMI)) // CMI demo does not have .IMX for voice + strcat(pointer, ".IMX"); + _imuseDigital->stopSound(kTalkSoundID); + _imuseDigital->startVoice(kTalkSoundID, pointer); ptr = _transText; } |