Reverted too complicated (and unneeded) volume settings code for towns driver.

svn-id: r29939

1 files changed, 4 insertions, 21 deletions

diff --git a/engines/kyra/kyra.cpp b/engines/kyra/kyra.cpp
index c6f9bd5625..61027555a5 100644
--- a/engines/kyra/kyra.cpp
+++ b/engines/kyra/kyra.cpp
@@ -96,27 +96,10 @@ int KyraEngine::init() {
 		// TODO: currently we don't support the PC98 sound data,
 		// but since it has the FM-Towns data files, we just use the
 		// FM-Towns driver
-
-		// Since we handle the volume internally for our FM-Towns driver we set the global
-		// volume for those sound types to the maximum.
-		_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, Audio::Mixer::kMaxMixerVolume);
-		_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, Audio::Mixer::kMaxMixerVolume);
-
-		if (_flags.gameID == GI_KYRA1) {
-			SoundTowns *snd = new SoundTowns(this, _mixer);
-
-			snd->setMusicVolume(ConfMan.getInt("music_volume"));
-			snd->setSoundEffectsVolume(ConfMan.getInt("sfx_volume"));
-
-			_sound = snd;
-		} else {
-			SoundTowns_v2 *snd = new SoundTowns_v2(this, _mixer);
-
-			snd->setMusicVolume(ConfMan.getInt("music_volume"));
-			snd->setSoundEffectsVolume(ConfMan.getInt("sfx_volume"));
-
-			_sound = snd;
-		}
+		if (_flags.gameID == GI_KYRA1)
+			_sound = new SoundTowns(this, _mixer);
+		else
+			_sound = new SoundTowns_v2(this, _mixer);
 	} else if (midiDriver == MD_ADLIB) {
 		_sound = new SoundAdlibPC(this, _mixer);
 		assert(_sound);