From fbbe535645b5095b39c68cb386f222e18cbbb3f4 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 14 Sep 2008 15:35:40 +0000
Subject: Fixed regression introduced with r34522. (Now games without 'cdaudio'
 config value set should startup again).

svn-id: r34523
---
 engines/kyra/kyra_v1.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index 835afd2062..0a935a3e0d 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -264,9 +264,10 @@ void KyraEngine_v1::readSettings() {
 	_configMusic = 0;
 	
 	if (!ConfMan.getBool("music_mute")) {
-		_configMusic = 1;
-		if (ConfMan.getBool("cdaudio") && (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98))
-			_configMusic = 2;
+		if (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98)
+			_configMusic = ConfMan.getBool("cdaudio") ? 2 : 1;
+		else
+			_configMusic = 1;
 	}
 	_configSounds = ConfMan.getBool("sfx_mute") ? 0 : 1;
 
-- 
cgit v1.2.3