aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2006-05-04 21:14:50 +0000
committerMax Horn2006-05-04 21:14:50 +0000
commitb727a89b6c905e120a25368bd0f85a20af0d14d9 (patch)
tree785e319568ef6189ce1453db8fc18490f9b02e79
parentffd43c54a6366251c5ca4b08a86cd3907b4fd05e (diff)
downloadscummvm-rg350-b727a89b6c905e120a25368bd0f85a20af0d14d9.tar.gz
scummvm-rg350-b727a89b6c905e120a25368bd0f85a20af0d14d9.tar.bz2
scummvm-rg350-b727a89b6c905e120a25368bd0f85a20af0d14d9.zip
Set speech_mute/sfx_mute/music_mute values in one single central place
svn-id: r22342
-rw-r--r--base/gameDetector.cpp6
-rw-r--r--engines/queen/queen.cpp3
-rw-r--r--engines/sword2/sword2.cpp3
3 files changed, 4 insertions, 8 deletions
diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp
index 4c7efa90bd..52be4dcf80 100644
--- a/base/gameDetector.cpp
+++ b/base/gameDetector.cpp
@@ -169,6 +169,10 @@ GameDetector::GameDetector() {
ConfMan.registerDefault("sfx_volume", 192);
ConfMan.registerDefault("speech_volume", 192);
+ ConfMan.registerDefault("music_mute", false);
+ ConfMan.registerDefault("sfx_mute", false);
+ ConfMan.registerDefault("speech_mute", false);
+
ConfMan.registerDefault("multi_midi", false);
ConfMan.registerDefault("native_mt32", false);
ConfMan.registerDefault("enable_gs", false);
@@ -184,8 +188,6 @@ GameDetector::GameDetector() {
// ConfMan.registerDefault("amiga", false);
ConfMan.registerDefault("platform", Common::kPlatformPC);
ConfMan.registerDefault("language", "en");
- ConfMan.registerDefault("speech_mute", false);
- ConfMan.registerDefault("sfx_mute", false);
ConfMan.registerDefault("subtitles", false);
ConfMan.registerDefault("boot_param", 0);
ConfMan.registerDefault("dump_scripts", false);
diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp
index 129d8358c2..305d5034d2 100644
--- a/engines/queen/queen.cpp
+++ b/engines/queen/queen.cpp
@@ -159,10 +159,7 @@ QueenEngine::~QueenEngine() {
}
void QueenEngine::registerDefaultSettings() {
- ConfMan.registerDefault("music_mute", false);
- ConfMan.registerDefault("sfx_mute", false);
ConfMan.registerDefault("talkspeed", Logic::DEFAULT_TALK_SPEED);
- ConfMan.registerDefault("speech_mute", _resource->isDemo() || _resource->isInterview());
ConfMan.registerDefault("subtitles", true);
}
diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp
index fdbcbb5c07..3954a211f1 100644
--- a/engines/sword2/sword2.cpp
+++ b/engines/sword2/sword2.cpp
@@ -196,9 +196,6 @@ void Sword2Engine::errorString(const char *buf1, char *buf2) {
}
void Sword2Engine::registerDefaultSettings() {
- ConfMan.registerDefault("music_mute", false);
- ConfMan.registerDefault("speech_mute", false);
- ConfMan.registerDefault("sfx_mute", false);
ConfMan.registerDefault("gfx_details", 2);
ConfMan.registerDefault("subtitles", false);
ConfMan.registerDefault("reverse_stereo", false);