From 603a5e4d6f7403d3d797ead4b4cc909ab55c34d1 Mon Sep 17 00:00:00 2001
From: Jonathan Gray
Date: Wed, 10 Aug 2005 12:42:56 +0000
Subject: 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
---
 queen/sound.cpp | 4 ++--
 queen/sound.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'queen')

diff --git a/queen/sound.cpp b/queen/sound.cpp
index d9f3b84cc5..97f464989c 100644
--- a/queen/sound.cpp
+++ b/queen/sound.cpp
@@ -60,7 +60,7 @@ Sound *Sound::giveSound(Audio::Mixer *mixer, QueenEngine *vm, uint8 compression)
 #endif
 		break;
 	case COMPRESSION_OGG:
-#if !defined(USE_VORBIS) && !defined(USE_TREMOR)
+#ifndef USE_VORBIS
 		warning("Using OGG compressed datafile, but OGG support not compiled in");
 		return new SilentSound(mixer, vm);
 #else
@@ -205,7 +205,7 @@ void MP3Sound::sfxPlay(const char *name, bool isSpeech) {
 }
 #endif
 
-#if defined(USE_VORBIS) || defined(USE_TREMOR)
+#ifdef USE_VORBIS
 void OGGSound::sfxPlay(const char *name, bool isSpeech) {
 	uint32 size;
 	Common::File *f = _vm->resource()->giveCompressedSound(name, &size);
diff --git a/queen/sound.h b/queen/sound.h
index fdc6cd2e03..5ab078d150 100644
--- a/queen/sound.h
+++ b/queen/sound.h
@@ -138,7 +138,7 @@ public:
 };
 #endif
 
-#if defined(USE_VORBIS) || defined(USE_TREMOR)
+#ifdef USE_VORBIS
 class OGGSound : public Sound {
 public:
 	OGGSound(Audio::Mixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {};
-- 
cgit v1.2.3