aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra
diff options
context:
space:
mode:
authorJohannes Schickel2008-09-14 14:58:37 +0000
committerJohannes Schickel2008-09-14 14:58:37 +0000
commit53cf9e6409d16842697f19a76a7d7522579ec3c0 (patch)
tree533b0113e90c247f2ae5b5ab1f7eee4c1947bf37 /engines/kyra
parent9ec7c3eaca458fd1647c51deab0632f5427d5f2d (diff)
downloadscummvm-rg350-53cf9e6409d16842697f19a76a7d7522579ec3c0.tar.gz
scummvm-rg350-53cf9e6409d16842697f19a76a7d7522579ec3c0.tar.bz2
scummvm-rg350-53cf9e6409d16842697f19a76a7d7522579ec3c0.zip
Only setup 'cdaudio' config default for FM-Towns/PC98.
svn-id: r34522
Diffstat (limited to 'engines/kyra')
-rw-r--r--engines/kyra/kyra_v1.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index 95f775d78b..835afd2062 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -247,8 +247,8 @@ void KyraEngine_v1::delayWithTicks(int ticks) {
}
void KyraEngine_v1::registerDefaultSettings() {
- if (_flags.gameID != GI_KYRA3)
- ConfMan.registerDefault("cdaudio", (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98));
+ if (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98)
+ ConfMan.registerDefault("cdaudio", true);
if (_flags.fanLang != Common::UNK_LANG) {
// HACK/WORKAROUND: Since we can't use registerDefault here to overwrite
// the global subtitles settings, we're using this hack to enable subtitles
@@ -265,7 +265,7 @@ void KyraEngine_v1::readSettings() {
if (!ConfMan.getBool("music_mute")) {
_configMusic = 1;
- if (_flags.gameID != GI_KYRA3 && ConfMan.getBool("cdaudio") && (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98))
+ if (ConfMan.getBool("cdaudio") && (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98))
_configMusic = 2;
}
_configSounds = ConfMan.getBool("sfx_mute") ? 0 : 1;