diff options
| author | Johannes Schickel | 2008-09-14 15:35:40 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-09-14 15:35:40 +0000 |
| commit | fbbe535645b5095b39c68cb386f222e18cbbb3f4 (patch) | |
| tree | e4801283e92e839402bc73649b6eda4687bab79b | |
| parent | 53cf9e6409d16842697f19a76a7d7522579ec3c0 (diff) | |
| download | scummvm-rg350-fbbe535645b5095b39c68cb386f222e18cbbb3f4.tar.gz scummvm-rg350-fbbe535645b5095b39c68cb386f222e18cbbb3f4.tar.bz2 scummvm-rg350-fbbe535645b5095b39c68cb386f222e18cbbb3f4.zip | |
Fixed regression introduced with r34522. (Now games without 'cdaudio' config value set should startup again).
svn-id: r34523
| -rw-r--r-- | engines/kyra/kyra_v1.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
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; |