diff options
Diffstat (limited to 'sword1')
| -rw-r--r-- | sword1/animation.cpp | 4 | ||||
| -rw-r--r-- | sword1/music.cpp | 4 | ||||
| -rw-r--r-- | sword1/sound.cpp | 4 | ||||
| -rw-r--r-- | sword1/sword1.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/sword1/animation.cpp b/sword1/animation.cpp index 18082374a3..7b768d0458 100644 --- a/sword1/animation.cpp +++ b/sword1/animation.cpp @@ -100,7 +100,7 @@ MoviePlayer::~MoviePlayer(void) { * @param id the id of the file */ void MoviePlayer::play(uint32 id) { -#if defined(USE_MPEG2) && defined(USE_VORBIS) +#if defined(USE_MPEG2) && (defined(USE_VORBIS) || defined(USE_TREMOR)) AnimationState *anim = new AnimationState(_scr, _snd, _sys); AudioStream *stream = NULL; if (SwordEngine::_systemVars.cutscenePackVersion == 1) { @@ -166,7 +166,7 @@ void MoviePlayer::play(uint32 id) { while (!anim->soundFinished()) _sys->delayMillis(100); delete anim; -#endif // USE_MPEG2 && USE_VORBIS +#endif // USE_MPEG2 && (USE_VORBIS || USE_TREMOR) } void MoviePlayer::insertOverlay(OverlayColor *buf, uint8 *ovl, OverlayColor *pal) { diff --git a/sword1/music.cpp b/sword1/music.cpp index b15fa6145e..ff6c817880 100644 --- a/sword1/music.cpp +++ b/sword1/music.cpp @@ -114,7 +114,7 @@ AudioStream *MusicHandle::createAudioSource(void) { case MusicMp3: return makeMP3Stream(&_file, _file.size()); #endif -#ifdef USE_VORBIS +#if defined(USE_VORBIS) || defined(USE_TREMOR) case MusicVorbis: return makeVorbisStream(&_file, _file.size()); #endif @@ -138,7 +138,7 @@ bool MusicHandle::play(const char *fileBase, bool loop) { if (_file.open(fileName)) _musicMode = MusicMp3; #endif -#ifdef USE_VORBIS +#if defined(USE_VORBIS) || defined(USE_TREMOR) if (!_file.isOpen()) { // mp3 doesn't exist (or not compiled with MAD support) sprintf(fileName, "%s.ogg", fileBase); if (_file.open(fileName)) 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); diff --git a/sword1/sword1.cpp b/sword1/sword1.cpp index 4475198940..bb1e6c32a1 100644 --- a/sword1/sword1.cpp +++ b/sword1/sword1.cpp @@ -297,7 +297,7 @@ const CdFile SwordEngine::_cdFileList[] = { ,{ "speech1.cl3", FLAG_SPEECH1 }, { "speech2.cl3", FLAG_SPEECH2 } #endif -#ifdef USE_VORBIS +#if defined(USE_VORBIS) || defined(USE_TREMOR) ,{ "speech1.clv", FLAG_SPEECH1 }, { "speech2.clv", FLAG_SPEECH2 } #endif |