diff options
| author | Jonathan Gray | 2005-08-10 12:42:56 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2005-08-10 12:42:56 +0000 |
| commit | 603a5e4d6f7403d3d797ead4b4cc909ab55c34d1 (patch) | |
| tree | 7d2419b901c71a0e6c823d4a7b07abebaf610dd7 /simon | |
| parent | 3c1b5648aed0be45b303cea49e7537c98dd4a001 (diff) | |
| download | scummvm-rg350-603a5e4d6f7403d3d797ead4b4cc909ab55c34d1.tar.gz scummvm-rg350-603a5e4d6f7403d3d797ead4b4cc909ab55c34d1.tar.bz2 scummvm-rg350-603a5e4d6f7403d3d797ead4b4cc909ab55c34d1.zip | |
Don't explicity check for tremor and vorbis everywhere and
require both USE_TREMOR and USE_VORBIS to be defined when
using tremor.
svn-id: r18642
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/sound.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/simon/sound.cpp b/simon/sound.cpp index 591d2c9b3e..606328366d 100644 --- a/simon/sound.cpp +++ b/simon/sound.cpp @@ -183,7 +183,7 @@ void MP3Sound::playSound(uint sound, Audio::SoundHandle *handle, byte flags) } #endif -#if defined(USE_VORBIS) || defined(USE_TREMOR) +#ifdef USE_VORBIS class VorbisSound : public BaseSound { public: VorbisSound(Audio::Mixer *mixer, File *file, uint32 base = 0) : BaseSound(mixer, file, base) {}; @@ -271,7 +271,7 @@ Sound::Sound(const byte game, const GameSpecificSettings *gss, Audio::Mixer *mix } } #endif -#if defined(USE_VORBIS) || defined(USE_TREMOR) +#ifdef USE_VORBIS if (!_voice && gss->vorbis_filename && gss->vorbis_filename[0]) { file->open(gss->vorbis_filename); if (file->isOpen()) { @@ -323,7 +323,7 @@ Sound::Sound(const byte game, const GameSpecificSettings *gss, Audio::Mixer *mix } } #endif -#if defined(USE_VORBIS) || defined(USE_TREMOR) +#ifdef USE_VORBIS if (!_effects && gss->vorbis_effects_filename && gss->vorbis_effects_filename[0]) { file->open(gss->vorbis_effects_filename); if (file->isOpen()) { |