KYRA: add some #ifdefs for disabling EOB

Disabling EOB should already work without error. This adds some #ifdefs to recently added files.

5 files changed, 21 insertions, 1 deletions

diff --git a/engines/kyra/sound/drivers/audiomaster2.cpp b/engines/kyra/sound/drivers/audiomaster2.cpp
index 7db98879ad..d50d51966f 100644
--- a/engines/kyra/sound/drivers/audiomaster2.cpp
+++ b/engines/kyra/sound/drivers/audiomaster2.cpp
@@ -20,6 +20,8 @@
  *
  */
 
+#ifdef ENABLE_EOB
+
 #include "kyra/resource/resource.h"
 #include "kyra/sound/drivers/audiomaster2.h"
 
@@ -1190,7 +1192,7 @@ void AudioMaster2IFFLoader::initResource() {
 AudioMaster2Internal *AudioMaster2Internal::_refInstance = 0;
 int AudioMaster2Internal::_refCount = 0;
 
-AudioMaster2Internal::AudioMaster2Internal(Audio::Mixer *mixer) : Paula(true, mixer->getOutputRate(), mixer->getOutputRate() / 50), _mixer(mixer), _res(0), _fadeOutSteps(0), _durationCounter(0), _ready(false) {
+AudioMaster2Internal::AudioMaster2Internal(Audio::Mixer *mixer) : Paula(true, mixer->getOutputRate(), mixer->getOutputRate() / 50), _mixer(mixer), _res(0), _io(0), _fadeOutSteps(0), _durationCounter(0), _ready(false) {
 	_channels[0] = _channels[1] = _channels[2] = _channels[3] = 0;
 	setAudioFilter(true);
 }
@@ -1553,3 +1555,5 @@ void AudioMaster2::setSoundEffectVolume(int volume) {
 }
 
 } // End of namespace Kyra
+
+#endif
\ No newline at end of file
diff --git a/engines/kyra/sound/drivers/audiomaster2.h b/engines/kyra/sound/drivers/audiomaster2.h
index 0ac21d23ba..7c02fb3442 100644
--- a/engines/kyra/sound/drivers/audiomaster2.h
+++ b/engines/kyra/sound/drivers/audiomaster2.h
@@ -36,6 +36,8 @@
  *
  */
 
+#ifdef ENABLE_EOB
+
 #ifndef KYRA_SOUND_AUDIOMASTER2_H
 #define KYRA_SOUND_AUDIOMASTER2_H
 
@@ -81,3 +83,5 @@ private:
 } // End of namespace Kyra
 
 #endif
+
+#endif
\ No newline at end of file
diff --git a/engines/kyra/sound/sound_amiga_eob.cpp b/engines/kyra/sound/sound_amiga_eob.cpp
index f572c11c43..eded4fe03c 100644
--- a/engines/kyra/sound/sound_amiga_eob.cpp
+++ b/engines/kyra/sound/sound_amiga_eob.cpp
@@ -20,6 +20,8 @@
  *
  */
 
+#ifdef ENABLE_EOB
+
 #include "kyra/sound/sound_intern.h"
 #include "kyra/resource/resource.h"
 #include "kyra/sound/drivers/audiomaster2.h"
@@ -234,3 +236,5 @@ int SoundAmiga_EoB::checkTrigger() {
 }
 
 } // End of namespace Kyra
+
+#endif
\ No newline at end of file
diff --git a/engines/kyra/sound/sound_intern.h b/engines/kyra/sound/sound_intern.h
index 8d76a80db6..29572f6fe2 100644
--- a/engines/kyra/sound/sound_intern.h
+++ b/engines/kyra/sound/sound_intern.h
@@ -349,6 +349,8 @@ protected:
 	int _tableSfxGame_Size;
 };
 
+#ifdef ENABLE_EOB
+
 class SoundTowns_Darkmoon : public Sound, public TownsAudioInterfacePluginDriver {
 public:
 	SoundTowns_Darkmoon(KyraEngine_v1 *vm, Audio::Mixer *mixer);
@@ -441,6 +443,8 @@ private:
 	bool _ready;
 };
 
+#endif
+
 } // End of namespace Kyra
 
 #endif
diff --git a/engines/kyra/sound/sound_towns_darkmoon.cpp b/engines/kyra/sound/sound_towns_darkmoon.cpp
index 3758dff560..a6032f8759 100644
--- a/engines/kyra/sound/sound_towns_darkmoon.cpp
+++ b/engines/kyra/sound/sound_towns_darkmoon.cpp
@@ -20,6 +20,8 @@
  *
  */
 
+#ifdef ENABLE_EOB
+
 #include "kyra/sound/sound_intern.h"
 #include "kyra/resource/resource.h"
 
@@ -283,3 +285,5 @@ void SoundTowns_Darkmoon::resetTrigger() {
 }
 
 } // End of namespace Kyra
+
+#endif
\ No newline at end of file