diff options
| author | Travis Howell | 2007-07-27 01:33:05 +0000 |
|---|---|---|
| committer | Travis Howell | 2007-07-27 01:33:05 +0000 |
| commit | de29c28483567c84c9b875f8b12202797985d74f (patch) | |
| tree | 07ae24056637def9d8f548e040ffcecce9def49a /engines/scumm | |
| parent | 533ebe13d2f552bd7d06c04d10e9a20c8033a1ff (diff) | |
| download | scummvm-rg350-de29c28483567c84c9b875f8b12202797985d74f.tar.gz scummvm-rg350-de29c28483567c84c9b875f8b12202797985d74f.tar.bz2 scummvm-rg350-de29c28483567c84c9b875f8b12202797985d74f.zip | |
Only set soundMode, if compressed segment exists.
svn-id: r28227
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse_sndmgr.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp index acc6593347..625a24ef81 100644 --- a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp +++ b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp @@ -615,22 +615,24 @@ int32 ImuseDigiSndMgr::getDataFromRegion(SoundDesc *soundDesc, int region, byte if (!len) { sprintf(fileName, "%s_reg%03d.ogg", soundDesc->name, region); cmpFile = soundDesc->bundle->getFile(fileName, offs, len); + if (len) { #ifndef USE_VORBIS - if (len) error("Vorbis library compiled support needed!"); #endif - soundMode = 2; + soundMode = 2; + } } if (!len) { sprintf(fileName, "%s_reg%03d.mp3", soundDesc->name, region); cmpFile = soundDesc->bundle->getFile(fileName, offs, len); + if (len) { #ifndef USE_MAD - if (len) error("Mad library compiled support needed!"); #endif - assert(len); - soundMode = 1; + soundMode = 1; + } } + assert(len); if (!soundDesc->compressedStream) { Common::MemoryReadStream *tmp = cmpFile->readStream(len); |