diff options
| author | Jonathan Gray | 2005-08-10 06:16:26 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2005-08-10 06:16:26 +0000 |
| commit | 3c1b5648aed0be45b303cea49e7537c98dd4a001 (patch) | |
| tree | bd810ba197c9ceeab024be3f4b602c558b92019f /scumm/imuse_digi | |
| parent | c6c5c8f868c0c0ea37ddef156b8581d304ad5cac (diff) | |
| download | scummvm-rg350-3c1b5648aed0be45b303cea49e7537c98dd4a001.tar.gz scummvm-rg350-3c1b5648aed0be45b303cea49e7537c98dd4a001.tar.bz2 scummvm-rg350-3c1b5648aed0be45b303cea49e7537c98dd4a001.zip | |
Rest of the changes required for tremor to actually work.
Based on patches against 0.7.1 by Jolan Luff.
svn-id: r18641
Diffstat (limited to 'scumm/imuse_digi')
| -rw-r--r-- | scumm/imuse_digi/dimuse_sndmgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/imuse_digi/dimuse_sndmgr.cpp b/scumm/imuse_digi/dimuse_sndmgr.cpp index 4c47ddaf16..508ae8e495 100644 --- a/scumm/imuse_digi/dimuse_sndmgr.cpp +++ b/scumm/imuse_digi/dimuse_sndmgr.cpp @@ -588,7 +588,7 @@ int32 ImuseDigiSndMgr::getDataFromRegion(soundStruct *soundHandle, int region, b if (!len) { sprintf(fileName, "%s_reg%03d.ogg", soundHandle->name, region); cmpFile = soundHandle->bundle->getFile(fileName, offs, len); -#ifndef USE_VORBIS +#if !defined(USE_VORBIS) && !defined(USE_TREMOR) if (len) error("Vorbis library compiled support needed!"); #endif @@ -596,7 +596,7 @@ int32 ImuseDigiSndMgr::getDataFromRegion(soundStruct *soundHandle, int region, b oggMode = true; } if (!soundHandle->compressedStream) { -#ifdef USE_VORBIS +#if defined(USE_VORBIS) || defined(USE_TREMOR) if (oggMode) soundHandle->compressedStream = makeVorbisStream(cmpFile, len); #endif |