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 /sword1/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 'sword1/sound.cpp')
| -rw-r--r-- | sword1/sound.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sword1/sound.cpp b/sword1/sound.cpp index ee6aca37b2..b6605b5fd8 100644 --- a/sword1/sound.cpp +++ b/sword1/sound.cpp @@ -203,7 +203,7 @@ bool Sound::startSpeech(uint16 roomNo, uint16 localNo) { _waveVolPos = 0; } #endif -#ifdef USE_VORBIS +#if defined(USE_VORBIS) || defined(USE_TREMOR) else if (_cowMode == CowVorbis) { _cowFile.seek(index); _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_speechHandle, makeVorbisStream(&_cowFile, sampleSize), SOUND_SPEECH_ID, speechVol, speechPan); @@ -329,7 +329,7 @@ void Sound::initCowSystem(void) { _cowMode = CowMp3; } #endif -#ifdef USE_VORBIS +#if defined(USE_VORBIS) || defined(USE_TREMOR) if (!_cowFile.isOpen()) { sprintf(cowName, "SPEECH%d.CLV", SwordEngine::_systemVars.currentCD); _cowFile.open(cowName); |