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/sound.cpp | |
| 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/sound.cpp')
| -rw-r--r-- | scumm/sound.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index a3ea155c6f..00d9d48610 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -792,7 +792,7 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle #endif break; case kVorbisMode: - #ifdef USE_VORBIS + #if defined(USE_VORBIS) || defined(USE_TREMOR) assert(size > 0); input = makeVorbisStream(_sfxFile, size); #endif @@ -1124,7 +1124,7 @@ ScummFile *Sound::openSfxFile() { #ifdef USE_FLAC { "sof", kFlacMode }, #endif - #ifdef USE_VORBIS + #if defined(USE_VORBIS) || defined(USE_TREMOR) { "sog", kVorbisMode }, #endif #ifdef USE_MAD |